Update emacs-snapshot to 23.1.91.20100111.

Changes:
* .dir-locals.el (change-log-mode): Restore bug-reference-mode.
* info/dir: Add Semantic.
* info/dir: Add EDT entry.
* .dir-locals.el (bug-reference-url-format): Change to debbugs.gnu.org.
* elisp package updates: edt, cedet, chart, eieio, files-x, font-setting,
  hfy-cmap, htmlfontify, mule-conf, ucs-normalize, mpc, imap, tramp,
  levents, lucid, sym-comp, org, js, and subword.

7 files changed, 505 insertions, 89 deletions

diff --git a/editors/emacs-snapshot/Makefile b/editors/emacs-snapshot/Makefile
index f9cc0da4776..1bdd06821be 100644
--- a/editors/emacs-snapshot/Makefile
+++ b/editors/emacs-snapshot/Makefile
@@ -1,62 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2009/08/26 19:58:43 sno Exp $
-
-DISTNAME=	emacs-snapshot_20090710.orig
-PKGNAME=	${DISTNAME:S/snapshot_/${EMACS_VERSION}./:S/.orig//}
-PKGREVISION=	1
-CATEGORIES=	editors
-MASTER_SITES=	http://emacs.orebokech.com/pool/main/e/emacs-snapshot/
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.gnu.org/software/emacs/emacs.html
-COMMENT=	GNU editing macros (development version)
-LICENSE=	gnu-gpl-v3
-
-PKG_DESTDIR_SUPPORT=	user-destdir
+# $NetBSD: Makefile,v 1.7 2010/01/18 19:34:20 minskim Exp $
 
 CONFLICTS+=	emacs-nox11-[0-9]*
 
-GNU_CONFIGURE=	yes
-INFO_FILES=	yes
-USE_TOOLS+=	gmake makeinfo gzip
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV:C/\.[0-9]*$//}
-
-CONFIGURE_ARGS+=	--srcdir=${WRKSRC}
-CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
-CONFIGURE_ENV+=		GAMEOWN=${GAMEOWN}
-
-BUILD_DEFS+=		VARBASE
-BUILD_DEFS+=		GAMEDATAMODE
-PLIST_SRC+=		PLIST
-
-BUILD_TARGET=		bootstrap
-EMACS_VERSION=		23.0.96
-PLIST_SUBST+=		EMACS_VERSION=${EMACS_VERSION}
-
-REPLACE_PERL=		lib-src/grep-changelog
-CHECK_INTERPRETER_SKIP=	bin/grep-changelog
-
-MAKE_DIRS_PERMS+=	${VARBASE}/games/emacs ${GAMEOWN} ${GAMEGRP} ${GAMEDIRMODE}
-CONF_FILES_PERMS+=	/dev/null ${VARBASE}/games/emacs/snake-scores \
-			${GAMEOWN} ${GAMEGRP} ${GAMEDATAMODE}
-CONF_FILES_PERMS+=	/dev/null ${VARBASE}/games/emacs/tetris-scores \
-			${GAMEOWN} ${GAMEGRP} ${GAMEDATAMODE}
-
-# build PATH in the dumped emacs is not a problem
-CHECK_WRKREF_SKIP+=	bin/emacs
-CHECK_WRKREF_SKIP+=	bin/emacs-${EMACS_VERSION}
+.include "../../editors/emacs-snapshot/Makefile.common"
 
 .include "options.mk"
+
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../mk/oss.buildlink3.mk"
-
-.if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtn.o)
-CPPFLAGS+=		-DDFLY_CRT_USRLIB
-.endif
-
-post-extract:
-	cp ${.CURDIR}/../../editors/emacs/files/site-init.el ${WRKSRC}/lisp
-	cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s
-	${CHMOD} -R go-w ${WRKSRC}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/emacs-snapshot/Makefile.common b/editors/emacs-snapshot/Makefile.common
new file mode 100644
index 00000000000..eb6a85da90f
--- /dev/null
+++ b/editors/emacs-snapshot/Makefile.common
@@ -0,0 +1,66 @@
+# $NetBSD: Makefile.common,v 1.1 2010/01/18 19:34:20 minskim Exp $
+
+DISTNAME=	emacs-snapshot_20100111.orig
+PKGNAME=	${DISTNAME:S/snapshot_/${EMACS_VERSION}./:S/.orig//}
+CATEGORIES=	editors
+MASTER_SITES=	http://emacs.orebokech.com/pool/main/e/emacs-snapshot/
+
+MAINTAINER=	minskim@NetBSD.org
+HOMEPAGE=	http://www.gnu.org/software/emacs/emacs.html
+COMMENT=	GNU editing macros (development version)
+LICENSE=	gnu-gpl-v3
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+CONFLICTS+=	emacs-nox11-[0-9]*
+
+GNU_CONFIGURE=	yes
+INFO_FILES=	yes
+USE_TOOLS+=	gmake makeinfo gzip
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV:C/\.[0-9]*$//}
+
+CONFIGURE_ARGS+=	--srcdir=${WRKSRC}
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
+CONFIGURE_ENV+=		GAMEOWN=${GAMEOWN}
+
+BUILD_DEFS+=		VARBASE
+BUILD_DEFS+=		GAMEDATAMODE
+PLIST_SRC+=		../../editors/emacs-snapshot/PLIST
+
+.include "../../editors/emacs-snapshot/version.mk"
+
+BUILD_TARGET=		bootstrap
+EMACS_VERSION=		${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}.${_EMACS_VERSION_MICRO}
+PLIST_SUBST+=		EMACS_VERSION=${EMACS_VERSION}
+
+REPLACE_PERL=		lib-src/grep-changelog
+CHECK_INTERPRETER_SKIP=	bin/grep-changelog
+
+MAKE_DIRS_PERMS+=	${VARBASE}/games/emacs ${GAMEOWN} ${GAMEGRP} ${GAMEDIRMODE}
+CONF_FILES_PERMS+=	/dev/null ${VARBASE}/games/emacs/snake-scores \
+			${GAMEOWN} ${GAMEGRP} ${GAMEDATAMODE}
+CONF_FILES_PERMS+=	/dev/null ${VARBASE}/games/emacs/tetris-scores \
+			${GAMEOWN} ${GAMEGRP} ${GAMEDATAMODE}
+
+# build PATH in the dumped emacs is not a problem
+CHECK_WRKREF_SKIP+=	bin/emacs
+CHECK_WRKREF_SKIP+=	bin/emacs-${EMACS_VERSION}
+
+.include "../../mk/bsd.prefs.mk"
+
+.if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtn.o)
+CPPFLAGS+=		-DDFLY_CRT_USRLIB
+.endif
+
+.if ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" || ${OPSYS} == "OpenBSD"
+.include "../../mk/curses.buildlink3.mk"
+.else
+.include "../../mk/termcap.buildlink3.mk"
+.endif
+
+.include "../../mk/oss.buildlink3.mk"
+
+post-extract:
+	cp ${.CURDIR}/../../editors/emacs/files/site-init.el ${WRKSRC}/lisp
+	cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s
+	${CHMOD} -R go-w ${WRKSRC}
diff --git a/editors/emacs-snapshot/PLIST b/editors/emacs-snapshot/PLIST
index 28562e9c771..79298270920 100644
--- a/editors/emacs-snapshot/PLIST
+++ b/editors/emacs-snapshot/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:50:22 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2010/01/18 19:34:20 minskim Exp $
 bin/b2m
 bin/ctags
 bin/ebrowse
@@ -17,8 +17,11 @@ info/cl
 info/dbus
 info/dired-x
 info/ebrowse
+info/ede
 info/ediff
+info/edt
 info/efaq
+info/eieio
 info/eintr
 info/elisp
 info/emacs
@@ -31,7 +34,6 @@ info/flymake
 info/forms
 info/gnus
 info/idlwave
-info/info
 info/mairix-el
 info/message
 info/mh-e
@@ -45,6 +47,7 @@ info/reftex
 info/remember
 info/sasl
 info/sc
+info/semantic
 info/ses
 info/sieve
 info/smtpmail
@@ -55,7 +58,6 @@ info/vip
 info/viper
 info/widget
 info/woman
-libexec/emacs/${EMACS_VERSION}/${MACHINE_GNU_PLATFORM}/cvtmail
 libexec/emacs/${EMACS_VERSION}/${MACHINE_GNU_PLATFORM}/digest-doc
 libexec/emacs/${EMACS_VERSION}/${MACHINE_GNU_PLATFORM}/fakemail
 libexec/emacs/${EMACS_VERSION}/${MACHINE_GNU_PLATFORM}/hexl
@@ -255,7 +257,7 @@ share/emacs/${EMACS_VERSION}/etc/e/README
 share/emacs/${EMACS_VERSION}/etc/e/eterm-color
 share/emacs/${EMACS_VERSION}/etc/e/eterm-color.ti
 share/emacs/${EMACS_VERSION}/etc/echo.msg
-share/emacs/${EMACS_VERSION}/etc/edt-user.doc
+share/emacs/${EMACS_VERSION}/etc/edt-user.el
 share/emacs/${EMACS_VERSION}/etc/emacs-buffer.gdb
 share/emacs/${EMACS_VERSION}/etc/emacs.bash
 share/emacs/${EMACS_VERSION}/etc/emacs.csh
@@ -396,6 +398,7 @@ share/emacs/${EMACS_VERSION}/etc/images/gnus/uu-decode.xpm
 share/emacs/${EMACS_VERSION}/etc/images/gnus/uu-post.pbm
 share/emacs/${EMACS_VERSION}/etc/images/gnus/uu-post.xpm
 share/emacs/${EMACS_VERSION}/etc/images/gud/README
+share/emacs/${EMACS_VERSION}/etc/images/gud/all.xpm
 share/emacs/${EMACS_VERSION}/etc/images/gud/break.pbm
 share/emacs/${EMACS_VERSION}/etc/images/gud/break.xpm
 share/emacs/${EMACS_VERSION}/etc/images/gud/cont.pbm
@@ -426,6 +429,7 @@ share/emacs/${EMACS_VERSION}/etc/images/gud/stepi.pbm
 share/emacs/${EMACS_VERSION}/etc/images/gud/stepi.xpm
 share/emacs/${EMACS_VERSION}/etc/images/gud/stop.pbm
 share/emacs/${EMACS_VERSION}/etc/images/gud/stop.xpm
+share/emacs/${EMACS_VERSION}/etc/images/gud/thread.xpm
 share/emacs/${EMACS_VERSION}/etc/images/gud/until.pbm
 share/emacs/${EMACS_VERSION}/etc/images/gud/until.xpm
 share/emacs/${EMACS_VERSION}/etc/images/gud/up.pbm
@@ -516,6 +520,15 @@ share/emacs/${EMACS_VERSION}/etc/images/mail/send.pbm
 share/emacs/${EMACS_VERSION}/etc/images/mail/send.xpm
 share/emacs/${EMACS_VERSION}/etc/images/mail/spam.xpm
 share/emacs/${EMACS_VERSION}/etc/images/mh-logo.xpm
+share/emacs/${EMACS_VERSION}/etc/images/mpc/README
+share/emacs/${EMACS_VERSION}/etc/images/mpc/add.xpm
+share/emacs/${EMACS_VERSION}/etc/images/mpc/ffwd.xpm
+share/emacs/${EMACS_VERSION}/etc/images/mpc/next.xpm
+share/emacs/${EMACS_VERSION}/etc/images/mpc/pause.xpm
+share/emacs/${EMACS_VERSION}/etc/images/mpc/play.xpm
+share/emacs/${EMACS_VERSION}/etc/images/mpc/prev.xpm
+share/emacs/${EMACS_VERSION}/etc/images/mpc/rewind.xpm
+share/emacs/${EMACS_VERSION}/etc/images/mpc/stop.xpm
 share/emacs/${EMACS_VERSION}/etc/images/new.pbm
 share/emacs/${EMACS_VERSION}/etc/images/new.xpm
 share/emacs/${EMACS_VERSION}/etc/images/next-node.pbm
@@ -1179,6 +1192,295 @@ share/emacs/${EMACS_VERSION}/lisp/case-table.el.gz
 share/emacs/${EMACS_VERSION}/lisp/case-table.elc
 share/emacs/${EMACS_VERSION}/lisp/cdl.el.gz
 share/emacs/${EMACS_VERSION}/lisp/cdl.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/cedet-cscope.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/cedet-cscope.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/cedet-files.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/cedet-files.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/cedet-global.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/cedet-global.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/cedet-idutils.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/cedet-idutils.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/cedet.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/cedet.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/data-debug.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/data-debug.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/autoconf-edit.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/autoconf-edit.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/cpp-root.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/cpp-root.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/dired.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/dired.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/emacs.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/emacs.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/files.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/files.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/linux.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/linux.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/loaddefs.el
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/locate.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/locate.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/make.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/make.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/makefile-edit.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/makefile-edit.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/pconf.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/pconf.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/pmake.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/pmake.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-archive.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-archive.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-aux.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-aux.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-comp.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-comp.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-elisp.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-elisp.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-info.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-info.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-misc.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-misc.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-obj.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-obj.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-prog.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-prog.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-scheme.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-scheme.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-shared.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj-shared.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/proj.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/project-am.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/project-am.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/shell.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/shell.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/simple.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/simple.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/source.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/source.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/speedbar.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/speedbar.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/srecode.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/srecode.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/system.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/system.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/util.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/ede/util.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/inversion.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/inversion.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/mode-local.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/mode-local.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/pulse.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/pulse.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/analyze.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/analyze.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/analyze/complete.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/analyze/complete.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/analyze/debug.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/analyze/debug.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/analyze/fcn.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/analyze/fcn.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/analyze/refs.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/analyze/refs.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/c-by.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/c-by.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/c.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/c.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/debug.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/debug.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/el.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/el.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/gcc.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/gcc.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/make-by.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/make-by.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/make.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/make.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/scm-by.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/scm-by.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/scm.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/bovine/scm.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/chart.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/chart.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/complete.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/complete.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/ctxt.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/ctxt.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-debug.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-debug.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-ebrowse.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-ebrowse.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-el.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-el.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-file.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-file.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-find.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-find.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-global.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-global.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-javascript.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-javascript.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-mode.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-mode.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-ref.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-ref.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-typecache.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db-typecache.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/db.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/debug.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/debug.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/decorate.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/decorate.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/decorate/include.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/decorate/include.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/decorate/mode.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/decorate/mode.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/dep.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/dep.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/doc.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/doc.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/ede-grammar.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/ede-grammar.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/edit.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/edit.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/find.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/find.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/format.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/format.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/fw.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/fw.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/grammar-wy.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/grammar-wy.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/grammar.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/grammar.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/html.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/html.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/ia-sb.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/ia-sb.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/ia.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/ia.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/idle.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/idle.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/java.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/java.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/lex-spp.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/lex-spp.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/lex.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/lex.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/loaddefs.el
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/mru-bookmark.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/mru-bookmark.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/sb.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/sb.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/scope.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/scope.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/senator.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/senator.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/sort.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/sort.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/symref.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/symref.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/symref/cscope.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/symref/cscope.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/symref/filter.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/symref/filter.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/symref/global.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/symref/global.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/symref/grep.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/symref/grep.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/symref/idutils.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/symref/idutils.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/symref/list.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/symref/list.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/tag-file.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/tag-file.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/tag-ls.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/tag-ls.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/tag-write.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/tag-write.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/tag.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/tag.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/texi.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/texi.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/util-modes.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/util-modes.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/util.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/util.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent/comp.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent/comp.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent/java-tags.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent/java-tags.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent/javascript.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent/javascript.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent/javat-wy.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent/javat-wy.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent/js-wy.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent/js-wy.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent/python-wy.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent/python-wy.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent/python.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent/python.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent/wisent.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/wisent/wisent.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/args.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/args.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/compile.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/compile.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/cpp.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/cpp.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/ctxt.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/ctxt.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/dictionary.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/dictionary.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/document.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/document.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/el.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/el.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/expandproto.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/expandproto.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/extract.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/extract.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/fields.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/fields.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/filters.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/filters.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/find.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/find.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/getset.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/getset.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/insert.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/insert.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/java.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/java.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/loaddefs.el
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/map.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/map.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/mode.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/mode.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/semantic.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/semantic.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/srt-mode.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/srt-mode.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/srt-wy.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/srt-wy.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/srt.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/srt.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/table.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/table.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/template.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/template.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/texi.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/srecode/texi.elc
 share/emacs/${EMACS_VERSION}/lisp/chistory.el.gz
 share/emacs/${EMACS_VERSION}/lisp/chistory.elc
 share/emacs/${EMACS_VERSION}/lisp/cmuscheme.el.gz
@@ -1302,6 +1604,8 @@ share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/byte-run.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/byte-run.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/bytecomp.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/bytecomp.elc
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/chart.el.gz
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/chart.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/check-declare.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/check-declare.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/checkdoc.el.gz
@@ -1338,6 +1642,20 @@ share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/easymenu.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/easymenu.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/edebug.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/edebug.elc
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-base.el.gz
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-base.elc
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-comp.el.gz
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-comp.elc
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-custom.el.gz
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-custom.elc
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-datadebug.el.gz
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-datadebug.elc
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-opt.el.gz
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-opt.elc
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-speedbar.el.gz
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-speedbar.elc
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio.el.gz
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eldoc.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eldoc.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/elint.el.gz
@@ -1358,8 +1676,6 @@ share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/gulp.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/gulp.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/helper.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/helper.elc
-share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/levents.el.gz
-share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/levents.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/lisp-mnt.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/lisp-mnt.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/lisp-mode.el.gz
@@ -1368,8 +1684,6 @@ share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/lisp.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/lisp.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/lmenu.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/lmenu.elc
-share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/lucid.el.gz
-share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/lucid.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/macroexp.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/macroexp.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/map-ynp.el.gz
@@ -1621,6 +1935,8 @@ share/emacs/${EMACS_VERSION}/lisp/ffap.el.gz
 share/emacs/${EMACS_VERSION}/lisp/ffap.elc
 share/emacs/${EMACS_VERSION}/lisp/filecache.el.gz
 share/emacs/${EMACS_VERSION}/lisp/filecache.elc
+share/emacs/${EMACS_VERSION}/lisp/files-x.el.gz
+share/emacs/${EMACS_VERSION}/lisp/files-x.elc
 share/emacs/${EMACS_VERSION}/lisp/files.el.gz
 share/emacs/${EMACS_VERSION}/lisp/files.elc
 share/emacs/${EMACS_VERSION}/lisp/filesets.el.gz
@@ -1646,6 +1962,8 @@ share/emacs/${EMACS_VERSION}/lisp/font-core.el.gz
 share/emacs/${EMACS_VERSION}/lisp/font-core.elc
 share/emacs/${EMACS_VERSION}/lisp/font-lock.el.gz
 share/emacs/${EMACS_VERSION}/lisp/font-lock.elc
+share/emacs/${EMACS_VERSION}/lisp/font-setting.el.gz
+share/emacs/${EMACS_VERSION}/lisp/font-setting.elc
 share/emacs/${EMACS_VERSION}/lisp/format-spec.el.gz
 share/emacs/${EMACS_VERSION}/lisp/format-spec.elc
 share/emacs/${EMACS_VERSION}/lisp/format.el.gz
@@ -1940,6 +2258,8 @@ share/emacs/${EMACS_VERSION}/lisp/hex-util.el.gz
 share/emacs/${EMACS_VERSION}/lisp/hex-util.elc
 share/emacs/${EMACS_VERSION}/lisp/hexl.el.gz
 share/emacs/${EMACS_VERSION}/lisp/hexl.elc
+share/emacs/${EMACS_VERSION}/lisp/hfy-cmap.el.gz
+share/emacs/${EMACS_VERSION}/lisp/hfy-cmap.elc
 share/emacs/${EMACS_VERSION}/lisp/hi-lock.el.gz
 share/emacs/${EMACS_VERSION}/lisp/hi-lock.elc
 share/emacs/${EMACS_VERSION}/lisp/hilit-chg.el.gz
@@ -1948,6 +2268,8 @@ share/emacs/${EMACS_VERSION}/lisp/hippie-exp.el.gz
 share/emacs/${EMACS_VERSION}/lisp/hippie-exp.elc
 share/emacs/${EMACS_VERSION}/lisp/hl-line.el.gz
 share/emacs/${EMACS_VERSION}/lisp/hl-line.elc
+share/emacs/${EMACS_VERSION}/lisp/htmlfontify.el.gz
+share/emacs/${EMACS_VERSION}/lisp/htmlfontify.elc
 share/emacs/${EMACS_VERSION}/lisp/ibuf-ext.el.gz
 share/emacs/${EMACS_VERSION}/lisp/ibuf-ext.elc
 share/emacs/${EMACS_VERSION}/lisp/ibuf-macs.el.gz
@@ -1989,8 +2311,6 @@ share/emacs/${EMACS_VERSION}/lisp/international/characters.el.gz
 share/emacs/${EMACS_VERSION}/lisp/international/characters.elc
 share/emacs/${EMACS_VERSION}/lisp/international/charprop.el
 share/emacs/${EMACS_VERSION}/lisp/international/cp51932.el
-share/emacs/${EMACS_VERSION}/lisp/international/encoded-kb.el.gz
-share/emacs/${EMACS_VERSION}/lisp/international/encoded-kb.elc
 share/emacs/${EMACS_VERSION}/lisp/international/eucjp-ms.el
 share/emacs/${EMACS_VERSION}/lisp/international/fontset.el.gz
 share/emacs/${EMACS_VERSION}/lisp/international/fontset.elc
@@ -2016,7 +2336,8 @@ share/emacs/${EMACS_VERSION}/lisp/international/latin1-disp.el.gz
 share/emacs/${EMACS_VERSION}/lisp/international/latin1-disp.elc
 share/emacs/${EMACS_VERSION}/lisp/international/mule-cmds.el.gz
 share/emacs/${EMACS_VERSION}/lisp/international/mule-cmds.elc
-share/emacs/${EMACS_VERSION}/lisp/international/mule-conf.el
+share/emacs/${EMACS_VERSION}/lisp/international/mule-conf.el.gz
+share/emacs/${EMACS_VERSION}/lisp/international/mule-conf.elc
 share/emacs/${EMACS_VERSION}/lisp/international/mule-diag.el.gz
 share/emacs/${EMACS_VERSION}/lisp/international/mule-diag.elc
 share/emacs/${EMACS_VERSION}/lisp/international/mule-util.el.gz
@@ -2031,6 +2352,8 @@ share/emacs/${EMACS_VERSION}/lisp/international/robin.el.gz
 share/emacs/${EMACS_VERSION}/lisp/international/robin.elc
 share/emacs/${EMACS_VERSION}/lisp/international/titdic-cnv.el.gz
 share/emacs/${EMACS_VERSION}/lisp/international/titdic-cnv.elc
+share/emacs/${EMACS_VERSION}/lisp/international/ucs-normalize.el.gz
+share/emacs/${EMACS_VERSION}/lisp/international/ucs-normalize.elc
 share/emacs/${EMACS_VERSION}/lisp/international/uni-bidi.el
 share/emacs/${EMACS_VERSION}/lisp/international/uni-category.el
 share/emacs/${EMACS_VERSION}/lisp/international/uni-combining.el
@@ -2293,6 +2616,8 @@ share/emacs/${EMACS_VERSION}/lisp/mouse-sel.el.gz
 share/emacs/${EMACS_VERSION}/lisp/mouse-sel.elc
 share/emacs/${EMACS_VERSION}/lisp/mouse.el.gz
 share/emacs/${EMACS_VERSION}/lisp/mouse.elc
+share/emacs/${EMACS_VERSION}/lisp/mpc.el.gz
+share/emacs/${EMACS_VERSION}/lisp/mpc.elc
 share/emacs/${EMACS_VERSION}/lisp/msb.el.gz
 share/emacs/${EMACS_VERSION}/lisp/msb.elc
 share/emacs/${EMACS_VERSION}/lisp/mwheel.el.gz
@@ -2331,6 +2656,8 @@ share/emacs/${EMACS_VERSION}/lisp/net/hmac-def.el.gz
 share/emacs/${EMACS_VERSION}/lisp/net/hmac-def.elc
 share/emacs/${EMACS_VERSION}/lisp/net/hmac-md5.el.gz
 share/emacs/${EMACS_VERSION}/lisp/net/hmac-md5.elc
+share/emacs/${EMACS_VERSION}/lisp/net/imap-hash.el.gz
+share/emacs/${EMACS_VERSION}/lisp/net/imap-hash.elc
 share/emacs/${EMACS_VERSION}/lisp/net/imap.el.gz
 share/emacs/${EMACS_VERSION}/lisp/net/imap.elc
 share/emacs/${EMACS_VERSION}/lisp/net/ldap.el.gz
@@ -2389,8 +2716,12 @@ share/emacs/${EMACS_VERSION}/lisp/net/tramp-fish.el.gz
 share/emacs/${EMACS_VERSION}/lisp/net/tramp-fish.elc
 share/emacs/${EMACS_VERSION}/lisp/net/tramp-ftp.el.gz
 share/emacs/${EMACS_VERSION}/lisp/net/tramp-ftp.elc
+share/emacs/${EMACS_VERSION}/lisp/net/tramp-gvfs.el.gz
+share/emacs/${EMACS_VERSION}/lisp/net/tramp-gvfs.elc
 share/emacs/${EMACS_VERSION}/lisp/net/tramp-gw.el.gz
 share/emacs/${EMACS_VERSION}/lisp/net/tramp-gw.elc
+share/emacs/${EMACS_VERSION}/lisp/net/tramp-imap.el.gz
+share/emacs/${EMACS_VERSION}/lisp/net/tramp-imap.elc
 share/emacs/${EMACS_VERSION}/lisp/net/tramp-smb.el.gz
 share/emacs/${EMACS_VERSION}/lisp/net/tramp-smb.elc
 share/emacs/${EMACS_VERSION}/lisp/net/tramp-uu.el.gz
@@ -2471,6 +2802,10 @@ share/emacs/${EMACS_VERSION}/lisp/obsolete/iso-swed.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/keyswap.el
 share/emacs/${EMACS_VERSION}/lisp/obsolete/lazy-lock.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/lazy-lock.elc
+share/emacs/${EMACS_VERSION}/lisp/obsolete/levents.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/levents.elc
+share/emacs/${EMACS_VERSION}/lisp/obsolete/lucid.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/lucid.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/old-whitespace.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/old-whitespace.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/options.el.gz
@@ -2487,6 +2822,8 @@ share/emacs/${EMACS_VERSION}/lisp/obsolete/scribe.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/scribe.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/swedish.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/swedish.elc
+share/emacs/${EMACS_VERSION}/lisp/obsolete/sym-comp.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/sym-comp.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/vc-mcvs.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/vc-mcvs.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/x-menu.el.gz
@@ -2495,6 +2832,8 @@ share/emacs/${EMACS_VERSION}/lisp/org/org-agenda.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-agenda.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-archive.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-archive.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-ascii.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-ascii.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-attach.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-attach.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-bbdb.el.gz
@@ -2507,26 +2846,48 @@ share/emacs/${EMACS_VERSION}/lisp/org/org-colview.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-colview.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-compat.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-compat.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-crypt.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-crypt.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-datetree.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-datetree.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-docbook.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-docbook.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-exp-blocks.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-exp-blocks.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-exp.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-exp.elc
-share/emacs/${EMACS_VERSION}/lisp/org/org-export-latex.el.gz
-share/emacs/${EMACS_VERSION}/lisp/org/org-export-latex.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-faces.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-faces.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-feed.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-feed.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-footnote.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-footnote.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-freemind.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-freemind.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-gnus.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-gnus.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-habit.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-habit.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-html.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-html.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-icalendar.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-icalendar.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-id.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-id.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-indent.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-indent.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-info.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-info.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-inlinetask.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-inlinetask.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-install.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-install.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-irc.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-irc.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-jsinfo.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-jsinfo.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-latex.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-latex.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-list.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-list.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-mac-message.el.gz
@@ -2537,28 +2898,36 @@ share/emacs/${EMACS_VERSION}/lisp/org/org-mew.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-mew.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-mhe.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-mhe.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-mobile.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-mobile.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-mouse.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-mouse.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-plot.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-plot.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-protocol.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-protocol.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-publish.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-publish.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-remember.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-remember.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-rmail.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-rmail.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-src.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-src.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-table.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-table.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-timer.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-timer.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-vm.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-vm.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-w3m.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-w3m.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-wl.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-wl.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-xoxo.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-xoxo.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org.elc
-share/emacs/${EMACS_VERSION}/lisp/org/org-timer.el.gz
-share/emacs/${EMACS_VERSION}/lisp/org/org-timer.elc
-share/emacs/${EMACS_VERSION}/lisp/org/org-w3m.el.gz
-share/emacs/${EMACS_VERSION}/lisp/org/org-w3m.elc
 share/emacs/${EMACS_VERSION}/lisp/outline.el.gz
 share/emacs/${EMACS_VERSION}/lisp/outline.elc
 share/emacs/${EMACS_VERSION}/lisp/paren.el.gz
@@ -2704,8 +3073,6 @@ share/emacs/${EMACS_VERSION}/lisp/progmodes/cc-mode.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/cc-mode.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/cc-styles.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/cc-styles.elc
-share/emacs/${EMACS_VERSION}/lisp/progmodes/cc-subword.el.gz
-share/emacs/${EMACS_VERSION}/lisp/progmodes/cc-subword.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/cc-vars.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/cc-vars.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/cfengine.el.gz
@@ -2778,6 +3145,8 @@ share/emacs/${EMACS_VERSION}/lisp/progmodes/idlwave.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/idlwave.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/inf-lisp.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/inf-lisp.elc
+share/emacs/${EMACS_VERSION}/lisp/progmodes/js.el.gz
+share/emacs/${EMACS_VERSION}/lisp/progmodes/js.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/ld-script.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/ld-script.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/m4-mode.el.gz
@@ -2816,8 +3185,8 @@ share/emacs/${EMACS_VERSION}/lisp/progmodes/simula.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/simula.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/sql.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/sql.elc
-share/emacs/${EMACS_VERSION}/lisp/progmodes/sym-comp.el.gz
-share/emacs/${EMACS_VERSION}/lisp/progmodes/sym-comp.elc
+share/emacs/${EMACS_VERSION}/lisp/progmodes/subword.el.gz
+share/emacs/${EMACS_VERSION}/lisp/progmodes/subword.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/tcl.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/tcl.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/vera-mode.el.gz
diff --git a/editors/emacs-snapshot/distinfo b/editors/emacs-snapshot/distinfo
index e8e0a6d9f93..b9931584fd4 100644
--- a/editors/emacs-snapshot/distinfo
+++ b/editors/emacs-snapshot/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2009/07/12 11:56:54 minskim Exp $
+$NetBSD: distinfo,v 1.5 2010/01/18 19:34:20 minskim Exp $
 
-SHA1 (emacs-snapshot_20090710.orig.tar.gz) = 4c60dfc6828c2d281b88062dc2ab3350a9d67933
-RMD160 (emacs-snapshot_20090710.orig.tar.gz) = 38a886dfc2b756c509f956eeaf0fef1b2cab4965
-Size (emacs-snapshot_20090710.orig.tar.gz) = 28816225 bytes
+SHA1 (emacs-snapshot_20100111.orig.tar.gz) = 9bf3f29885b8577cc2b540352e2398650c1f09ac
+RMD160 (emacs-snapshot_20100111.orig.tar.gz) = 5445b39aaf0c3509084f3d1dea7c7f4ff1276951
+Size (emacs-snapshot_20100111.orig.tar.gz) = 30259529 bytes
 SHA1 (patch-ab) = 53fd489995efae908827d7a3de4811daf156fd0a
-SHA1 (patch-ac) = 727439e174f1febd7fba2174a70a4e781414028d
+SHA1 (patch-ac) = 9378586aa9720beebf19b9d54e94ef4f08e50745
diff --git a/editors/emacs-snapshot/options.mk b/editors/emacs-snapshot/options.mk
index 655aff00423..08447f1d32d 100644
--- a/editors/emacs-snapshot/options.mk
+++ b/editors/emacs-snapshot/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2009/06/05 02:57:57 minskim Exp $
+# $NetBSD: options.mk,v 1.2 2010/01/18 19:34:20 minskim Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.emacs
@@ -7,7 +7,7 @@ PKG_OPTIONS_OPTIONAL_GROUPS+= window-system
 PKG_OPTIONS_GROUP.window-system= x11 nextstep
 PKG_OPTIONS_OPTIONAL_GROUPS+= toolkit
 PKG_OPTIONS_GROUP.toolkit= gtk motif xaw
-PKG_SUGGESTED_OPTIONS=	x11 xft2
+PKG_SUGGESTED_OPTIONS=	dbus svg x11 xft2
 
 .include "../../mk/bsd.options.mk"
 
@@ -39,11 +39,11 @@ PKG_OPTIONS+=		x11
 .endif
 
 ###
-### Default to using the Xaw X11 toolkit if none is specified.
+### Default to using the GTK toolkit if none is specified.
 ###
 .if !empty(PKG_OPTIONS:Mx11)
 .  if empty(PKG_OPTIONS:Mgtk) && empty(PKG_OPTIONS:Mmotif) && empty(PKG_OPTIONS:Mxaw)
-PKG_OPTIONS+=		xaw
+PKG_OPTIONS+=		gtk
 .  endif
 .endif
 
diff --git a/editors/emacs-snapshot/patches/patch-ac b/editors/emacs-snapshot/patches/patch-ac
index 0cb9d6085ae..a861147b8d0 100644
--- a/editors/emacs-snapshot/patches/patch-ac
+++ b/editors/emacs-snapshot/patches/patch-ac
@@ -1,7 +1,16 @@
-$NetBSD: patch-ac,v 1.1.1.1 2009/06/05 02:57:57 minskim Exp $
+$NetBSD: patch-ac,v 1.2 2010/01/18 19:34:20 minskim Exp $
 
---- Makefile.in	2009-05-04 01:13:20.000000000 +0000
+--- Makefile.in.orig	2009-12-14 19:02:43.000000000 -0800
 +++ Makefile.in
+@@ -141,7 +141,7 @@ MAN_PAGES=b2m.1 ctags.1 ebrowse.1 emacs.
+ infodir=@infodir@
+ INFO_FILES=ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse	\
+            ede ediff edt eieio efaq eintr elisp emacs emacs-mime epa erc \
+-	   eshell eudc flymake forms gnus idlwave info mairix-el	\
++	   eshell eudc flymake forms gnus idlwave mairix-el	\
+ 	   message mh-e newsticker nxml-mode org pcl-cvs pgg rcirc	\
+ 	   reftex remember sasl sc semantic ses sieve smtpmail speedbar \
+ 	   tramp url vip viper widget woman
 @@ -403,7 +403,7 @@ $(srcdir)/src/stamp-h.in: $(AUTOCONF_INP
  install: all install-arch-indep install-arch-dep install-leim blessmail
  	@true
@@ -11,3 +20,26 @@ $NetBSD: patch-ac,v 1.1.1.1 2009/06/05 02:57:57 minskim Exp $
  
  ### Install the executables that were compiled specifically for this machine.
  ### It would be nice to do something for a parallel make
+@@ -574,21 +574,11 @@ install-arch-indep: mkdir info install-e
+ 	      test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \
+ 	      for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
+ 	        ${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f; \
+-	        chmod a+r $(DESTDIR)${infodir}/$$f; \
+ 	      done; \
+ 	   done); \
+ 	else true; fi
+ 	-unset CDPATH; \
+-	thisdir=`/bin/pwd`; \
+-	if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd $(DESTDIR)${infodir} && /bin/pwd)` ]; \
+-	then \
+-	  for elt in $(INFO_FILES); do \
+-	    test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \
+-	    (cd $${thisdir}; \
+-	     ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
+-	  done; \
+-	else true; fi
+-	-chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS}
++	chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS}
+ 	thisdir=`/bin/pwd`; \
+ 	cd ${mansrcdir}; \
+ 	for page in ${MAN_PAGES}; do \
diff --git a/editors/emacs-snapshot/version.mk b/editors/emacs-snapshot/version.mk
index 7fe577d7447..79eddb1e9c4 100644
--- a/editors/emacs-snapshot/version.mk
+++ b/editors/emacs-snapshot/version.mk
@@ -1,4 +1,4 @@
-# $NetBSD: version.mk,v 1.4 2009/07/12 11:56:54 minskim Exp $
+# $NetBSD: version.mk,v 1.5 2010/01/18 19:34:20 minskim Exp $
 
 _EMACS_FLAVOR=	emacs
 _EMACS_REQD=	emacs>=23
@@ -6,5 +6,5 @@ _EMACS_PKGDEP.base=
 _EMACS_PKGDEP.leim=
 
 _EMACS_VERSION_MAJOR=	23
-_EMACS_VERSION_MINOR=	0
-_EMACS_VERSION_MICRO=	96
+_EMACS_VERSION_MINOR=	1
+_EMACS_VERSION_MICRO=	91