. update to version 23.2;

. introduce OPTIONS.

PR:		ports/146458
Submitted by:	Ashish SHUKLA <wahjava at gmail.com> (maintainer)

9 files changed, 571 insertions, 196 deletions

diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile
index af50a949078f..68fa15eb01d3 100644
--- a/editors/emacs23/Makefile
+++ b/editors/emacs23/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}
-PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	editors ipv6
 MASTER_SITES=	${MASTER_SITE_GNU}
@@ -16,20 +15,6 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	wahjava@gmail.com
 COMMENT=	GNU editing macros
 
-.if !defined(WITHOUT_X11)
-USE_XORG=	x11
-USE_GNOME=	librsvg2
-.if defined(WITHOUT_GTK)
-USE_XORG=	xaw xft xpm
-.else
-USE_GNOME+=	gtk20
-.endif
-LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		ungif.5:${PORTSDIR}/graphics/libungif \
-		png.6:${PORTSDIR}/graphics/png
-.endif
-
 MAKE_JOBS_UNSAFE=	yes
 
 CONFLICTS=	emacs-19.* emacs-21.* emacs-22.* \
@@ -38,33 +23,12 @@ CONFLICTS=	emacs-19.* emacs-21.* emacs-22.* \
 
 INSTALLS_ICONS=	yes
 
-EMACS_VER=	23.1
+EMACS_VER=	23.2
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:262
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 
-.if defined(WITHOUT_X11)
-CONFIGURE_ARGS=		--with-x=no
-.else
-.if !defined(WITHOUT_GTK)
-CONFIGURE_ARGS=		--with-x-toolkit=gtk
-.else
-CONFIGURE_ARGS=		--with-x-toolkit=athena
-.endif
-LIB_DEPENDS+=		freetype.9:${PORTSDIR}/print/freetype2 \
-			m17n.4:${PORTSDIR}/devel/m17n-lib
-# also libotf, which is pulled in by m17n
-
-# m17n depends on libintl.so too
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lintl"
 USE_GETTEXT=	yes
-.endif
-
-.if defined(WITHOUT_XIM)
-CONFIGURE_ARGS+=	--without-xim
-.endif
 
 MAN1=		b2m.1 ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \
 		grep-changelog.1 rcs-checkin.1
@@ -73,36 +37,179 @@ PLIST_SUB=	EMACS_VER=${EMACS_VER} EMACS_ARCH=${CONFIGURE_TARGET}
 MAKE_ENV=	LC_ALL=C
 
 INFO=		ada-mode auth autotype calc ccmode cl dbus dired-x \
-		ebrowse ediff efaq eintr elisp emacs-mime emacs epa \
+		ebrowse ede ediff edt efaq eieio eintr elisp emacs-mime emacs epa \
 		erc eshell eudc flymake forms gnus idlwave info \
 		mairix-el message mh-e newsticker nxml-mode \
-		org pcl-cvs pgg rcirc reftex remember sasl sc ses sieve \
+		org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve \
 		smtpmail speedbar tramp url vip viper widget woman
 
-OPTIONS=	SOURCES	"Install source code"	ON
+OPTIONS=	DBUS	"DBus support"			ON \
+		GCONF	"GConf support"			ON \
+		GIF	"GIF support"			ON \
+		GTK2	"GTK+ support"			ON \
+		JPEG	"JPEG support"			ON \
+		M17N	"M17N support for text-shaping"	ON \
+		MOTIF	"Motif support"			OFF \
+		OTF	"Opentype Font"			ON \
+		PNG	"PNG support"			ON \
+		SOUND	"Sound support"			ON \
+		SOURCES	"Install source code"		ON \
+		SVG	"SVG support"			ON \
+		TIFF	"TIFF support"			ON \
+		X11	"X11 support"			ON \
+		XAW	"XAW support"			OFF \
+		XAW3D	"XAW3D support"			OFF \
+		SYNC_INPUT	"Synchronously process asynchronous input"	ON \
+		SCROLLBARS	"Without toolkit scroll-bars"			ON \
+		XFT	"Xft support"			ON \
+		XIM	"XIM support"			ON \
+		XPM	"XPM support"			ON
+
+.include <bsd.port.options.mk>
 
-.include <bsd.port.pre.mk>
+.if defined(WITHOUT_X11)
+CONFIGURE_ARGS+=	--without-x
+.else
+USE_XORG=	x11
+USE_GNOME=
 
-.if defined(WITH_SOURCES)
-PLIST_SUB+=	SOURCES=""
+.if defined(WITHOUT_SVG)
+CONFIGURE_ARGS+=	--without-rsvg
 .else
-PLIST_SUB+=	SOURCES="@comment "
+USE_GNOME+=	librsvg2
 .endif
 
-.if ${ARCH} == "ia64"
-BROKEN=	Emacs 22.X does not currently build on ia64
+.if defined(WITHOUT_GTK2)
+.if defined(WITH_XAW)
+.if defined(WITH_XAW3D) || defined(WITH_MOTIF)
+IGNORE=	please choose only one toolkit: GTK+/Motif/Xaw/Xaw3d
+.endif
+USE_XORG=	xaw
+CONFIGURE_ARGS+=	--with-x-toolkit=athena --without-xaw3d
+.elif defined(WITH_XAW3D)
+.if defined(WITH_MOTIF)
+IGNORE=	please choose only one toolkit: GTK+/Motif/Xaw/Xaw3d
+.endif
+LIB_DEPENDS+=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
+CONFIGURE_ARGS+=	--with-x-toolkit=athena
+.elif defined(WITH_MOTIF)
+USE_MOTIF=	yes
+CONFIGURE_ARGS+=	--with-x-toolkit=motif
+.else
+IGNORE=	please choose a toolkit: GTK+/Motif/Xaw/Xaw3d, or build without X11 support
+.endif
+.else
+.if defined(WITH_XAW) || defined(WITH_XAW3D) || defined(WITH_MOTIF)
+IGNORE=	please choose only one toolkit: GTK+/Motif/Xaw/Xaw3d
+.endif
+USE_GNOME+=	gtk20
+CONFIGURE_ARGS+=	--with-x-toolkit=gtk
+.endif
+
+.if defined(WITHOUT_SCROLLBARS)
+CONFIGURE_ARGS+=	--without-toolkit-scroll-bars
+.endif
+
+.if defined(WITHOUT_SOUND)
+CONFIGURE_ARGS+=	--without-sound
 .endif
 
-pre-everything::
-.if !defined(WITHOUT_X11) && !defined(WITHOUT_GTK)
-	@${ECHO_MSG} "====>"
-	@${ECHO_MSG} "====> To disable GTK+ interface support, define WITHOUT_X11 or WITHOUT_GTK"
-	@${ECHO_MSG} "====>"
+.if defined(WITHOUT_SYNC_INPUT)
+CONFIGURE_ARGS+=	--without-sync-input
+.endif
+
+.if defined(WITHOUT_JPEG)
+CONFIGURE_ARGS+=	--without-jpeg
+.else
+LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg
 .endif
-.if !defined(WITHOUT_X11) && !defined(WITHOUT_XIM)
-	@${ECHO_MSG} "====>"
-	@${ECHO_MSG} "====> To disable X11 Input Method support, define WITHOUT_XIM"
-	@${ECHO_MSG} "====>"
+
+.if defined(WITHOUT_TIFF)
+CONFIGURE_ARGS+=	--without-tiff
+.else
+LIB_DEPENDS+=	tiff.4:${PORTSDIR}/graphics/tiff
+.endif
+
+.if defined(WITHOUT_GIF)
+CONFIGURE_ARGS+=	--without-gif
+.else
+LIB_DEPENDS+=	ungif.5:${PORTSDIR}/graphics/libungif
+.endif
+
+.if defined(WITHOUT_PNG)
+CONFIGURE_ARGS+=	--without-png
+.else
+LIB_DEPENDS+=	png.6:${PORTSDIR}/graphics/png
+.endif
+
+.if defined(WITHOUT_XPM)
+CONFIGURE_ARGS+=	--without-xpm
+.else
+USE_XORG+=	xpm
+.endif
+
+.if defined(WITHOUT_XFT)
+.if defined(WITH_M17N)
+IGNORE=	m17n support requires Xft. Please run 'make config'
+.elif defined(WITH_OTF)
+IGNORE=	otf support requires Xft. Please run 'make config'
+.else
+CONFIGURE_ARGS+=	--without-xft
+.endif
+.else
+USE_XORG+=	xft
+LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
+.endif
+
+.if defined(WITHOUT_M17N)
+CONFIGURE_ARGS+=	--without-m17n-flt
+CONFIGURE_ENV+=		LDFLAGS="-L${LOCALBASE}/lib"
+.else
+.if !defined(WITHOUT_XFT)
+LIB_DEPENDS+=	m17n.4:${PORTSDIR}/devel/m17n-lib
+.endif
+CONFIGURE_ENV+=		LDFLAGS="-L${LOCALBASE}/lib -lintl"
+.endif
+
+.if defined(WITHOUT_OTF)
+CONFIGURE_ARGS+=	--without-libotf
+.else
+.if !defined(WITHOUT_XFT)
+LIB_DEPENDS+=	otf.0:${PORTSDIR}/print/libotf
+.endif
+.endif
+
+.if defined(WITHOUT_GCONF)
+CONFIGURE_ARGS+=	--without-gconf
+.else
+USE_GNOME+=	gconf2
+.endif
+
+.if defined(WITHOUT_XIM)
+CONFIGURE_ARGS+=	--without-xim
+.endif
+
+.endif
+
+.if defined(WITHOUT_DBUS)
+CONFIGURE_ARGS+=	--without-dbus
+.else
+LIB_DEPENDS+=	dbus-1.3:${PORTSDIR}/devel/dbus \
+		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+.endif
+
+CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include"
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITHOUT_SOURCES)
+PLIST_SUB+=	SOURCES="@comment "
+.else
+PLIST_SUB+=	SOURCES=""
+.endif
+
+.if ${ARCH} == "ia64"
+BROKEN=	Emacs 22.X does not currently build on ia64
 .endif
 
 post-patch:
diff --git a/editors/emacs23/distinfo b/editors/emacs23/distinfo
index f1300990fcd7..fb52911cf3c8 100644
--- a/editors/emacs23/distinfo
+++ b/editors/emacs23/distinfo
@@ -1,3 +1,3 @@
-MD5 (emacs-23.1.tar.bz2) = 17f7f0ba68a0432d58fa69d05a2225be
-SHA256 (emacs-23.1.tar.bz2) = 2b35f4457c7a0ee9f9185579cc2890b43f129a112cf22500233489db7a24cb1c
-SIZE (emacs-23.1.tar.bz2) = 34382732
+MD5 (emacs-23.2.tar.bz2) = 057a0379f2f6b85fb114d8c723c79ce2
+SHA256 (emacs-23.2.tar.bz2) = ffd466fa5b06c0451612210190d2feb14b2d7ca9dd41893357d2201dd28526c5
+SIZE (emacs-23.2.tar.bz2) = 38376047
diff --git a/editors/emacs23/files/patch-ChangeLog b/editors/emacs23/files/patch-ChangeLog
deleted file mode 100644
index 4fc2beae5610..000000000000
--- a/editors/emacs23/files/patch-ChangeLog
+++ /dev/null
@@ -1,11 +0,0 @@
---- ChangeLog.orig	2009-07-29 18:10:35.000000000 +0300
-+++ ChangeLog	2010-01-23 11:35:20.591761496 +0200
-@@ -1,3 +1,8 @@
-+2010-01-18  Giorgos Keramidas  <keramida@ceid.upatras.gr>  (tiny change)
-+
-+	* configure.in: Check for utmp.h availability, since some
-+	systems don't have one (e.g. FreeBSD 9.X and later versions).
-+
- 2009-07-29  Chong Yidong  <cyd@stupidchicken.com>
- 
- 	* Version 23.1 released.
diff --git a/editors/emacs23/files/patch-configure.in b/editors/emacs23/files/patch-configure.in
deleted file mode 100644
index 14cb6ddd95fc..000000000000
--- a/editors/emacs23/files/patch-configure.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	2009-07-29 18:09:49.000000000 +0300
-+++ configure.in	2010-01-23 11:34:48.296987092 +0200
-@@ -1014,7 +1014,7 @@
-   linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \
-   termcap.h stdio_ext.h fcntl.h strings.h coff.h pty.h sys/mman.h \
-   sys/param.h sys/vlimit.h sys/resource.h locale.h sys/_mbstate_t.h \
--  sys/utsname.h pwd.h)
-+  sys/utsname.h pwd.h utmp.h)
- 
- AC_MSG_CHECKING(if personality LINUX32 can be set)
- AC_TRY_COMPILE([#include <sys/personality.h>], [personality (PER_LINUX32)],
diff --git a/editors/emacs23/files/patch-src-ChangeLog b/editors/emacs23/files/patch-src-ChangeLog
deleted file mode 100644
index 3aa0d6117851..000000000000
--- a/editors/emacs23/files/patch-src-ChangeLog
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/ChangeLog.orig	2009-07-29 19:55:12.000000000 +0300
-+++ src/ChangeLog	2010-01-23 11:35:44.446334596 +0200
-@@ -1,3 +1,9 @@
-+2010-01-18  Giorgos Keramidas  <keramida@ceid.upatras.gr>  (tiny change)
-+
-+	* filelock.c: Include utmp.h only when HAVE_UTMP_H is true,
-+	since some systems don't have one (e.g. FreeBSD 9.X and later
-+	versions).
-+
- 2009-07-29  Chong Yidong  <cyd@stupidchicken.com>
- 
- 	* Version 23.1 released.
diff --git a/editors/emacs23/files/patch-src-filelock.c b/editors/emacs23/files/patch-src-filelock.c
deleted file mode 100644
index 7f8b0d0d4b59..000000000000
--- a/editors/emacs23/files/patch-src-filelock.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/filelock.c.orig	2009-06-21 07:38:14.000000000 +0300
-+++ src/filelock.c	2010-01-23 11:34:48.414989942 +0200
-@@ -62,7 +62,9 @@
- 
- #ifdef CLASH_DETECTION
- 
-+#ifdef HAVE_UTMP_H
- #include <utmp.h>
-+#endif
- 
- #if !defined (S_ISLNK) && defined (S_IFLNK)
- #define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
diff --git a/editors/emacs23/files/patch-src-image.c b/editors/emacs23/files/patch-src-image.c
deleted file mode 100644
index 408d00ba8095..000000000000
--- a/editors/emacs23/files/patch-src-image.c
+++ /dev/null
@@ -1,47 +0,0 @@
---- src/image.c.orig	2010-03-29 08:46:39.902587060 +0200
-+++ src/image.c	2010-03-29 08:51:40.907908128 +0200
-@@ -5793,7 +5793,7 @@
- /* PNG library details.  */
- 
- DEF_IMGLIB_FN (png_get_io_ptr);
--DEF_IMGLIB_FN (png_check_sig);
-+DEF_IMGLIB_FN (png_sig_cmp);
- DEF_IMGLIB_FN (png_create_read_struct);
- DEF_IMGLIB_FN (png_create_info_struct);
- DEF_IMGLIB_FN (png_destroy_read_struct);
-@@ -5824,7 +5824,7 @@
-     return 0;
- 
-   LOAD_IMGLIB_FN (library, png_get_io_ptr);
--  LOAD_IMGLIB_FN (library, png_check_sig);
-+  LOAD_IMGLIB_FN (library, png_sig_cmp);
-   LOAD_IMGLIB_FN (library, png_create_read_struct);
-   LOAD_IMGLIB_FN (library, png_create_info_struct);
-   LOAD_IMGLIB_FN (library, png_destroy_read_struct);
-@@ -5849,7 +5849,7 @@
- #else
- 
- #define fn_png_get_io_ptr		png_get_io_ptr
--#define fn_png_check_sig		png_check_sig
-+#define fn_png_sig_cmp			png_sig_cmp
- #define fn_png_create_read_struct	png_create_read_struct
- #define fn_png_create_info_struct	png_create_info_struct
- #define fn_png_destroy_read_struct	png_destroy_read_struct
-@@ -5996,7 +5996,7 @@
- 
-       /* Check PNG signature.  */
-       if (fread (sig, 1, sizeof sig, fp) != sizeof sig
--	  || !fn_png_check_sig (sig, sizeof sig))
-+	  || fn_png_sig_cmp (sig, 0, sizeof sig))
- 	{
- 	  image_error ("Not a PNG file: `%s'", file, Qnil);
- 	  UNGCPRO;
-@@ -6013,7 +6013,7 @@
- 
-       /* Check PNG signature.  */
-       if (tbr.len < sizeof sig
--	  || !fn_png_check_sig (tbr.bytes, sizeof sig))
-+	  || fn_png_sig_cmp (tbr.bytes, 0, sizeof sig))
- 	{
- 	  image_error ("Not a PNG image: `%s'", img->spec, Qnil);
- 	  UNGCPRO;
diff --git a/editors/emacs23/files/patch-src-xfns.c b/editors/emacs23/files/patch-src-xfns.c
deleted file mode 100644
index 16415d515a53..000000000000
--- a/editors/emacs23/files/patch-src-xfns.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/xfns.c.orig	2009-08-31 00:03:02.000000000 +0100
-+++ src/xfns.c	2009-08-31 00:21:39.000000000 +0100
-@@ -468,8 +468,10 @@
-       if (!FRAME_X_P (f) || FRAME_X_DISPLAY_INFO (f) != dpyinfo)
- 	continue;
-       x = f->output_data.x;
--      /* Match if the window is this frame's menubar.  */
- #ifdef USE_GTK
-+      /* Match if the window is this frame's window (button presses are no longer
-+         caught by the menubar) or a menu in the menubar.
-+       */
-       if (x->menubar_widget)
-         {
-           GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc);
-@@ -477,13 +479,14 @@
- 
-           BLOCK_INPUT;
-           if (gwdesc != 0
--              && (gwdesc == x->menubar_widget
-+              && (gwdesc == gtk_widget_get_parent (gtk_widget_get_parent (x->menubar_widget))
-                   || gtk_widget_get_parent (gwdesc) == x->menubar_widget))
-             found = 1;
-           UNBLOCK_INPUT;
-           if (found) return f;
-         }
- #else
-+      /* Match if the window is in this frame's menubar */
-       if (x->menubar_widget
- 	  && lw_window_is_in_menubar (wdesc, x->menubar_widget))
- 	return f;
diff --git a/editors/emacs23/pkg-plist b/editors/emacs23/pkg-plist
index d1ce7db1792f..1104730f992e 100644
--- a/editors/emacs23/pkg-plist
+++ b/editors/emacs23/pkg-plist
@@ -7,7 +7,6 @@ bin/emacsclient
 bin/etags
 bin/grep-changelog
 bin/rcs-checkin
-libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/cvtmail
 libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/digest-doc
 libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/fakemail
 libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/hexl
@@ -199,7 +198,7 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/e/eterm-color
 %%DATADIR%%/%%EMACS_VER%%/etc/e/eterm-color.ti
 %%DATADIR%%/%%EMACS_VER%%/etc/echo.msg
-%%DATADIR%%/%%EMACS_VER%%/etc/edt-user.doc
+%%DATADIR%%/%%EMACS_VER%%/etc/edt-user.el
 %%DATADIR%%/%%EMACS_VER%%/etc/emacs-buffer.gdb
 %%DATADIR%%/%%EMACS_VER%%/etc/emacs.bash
 %%DATADIR%%/%%EMACS_VER%%/etc/emacs.csh
@@ -340,6 +339,7 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/uu-post.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/uu-post.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/README
+%%DATADIR%%/%%EMACS_VER%%/etc/images/gud/all.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/break.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/break.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/cont.pbm
@@ -360,8 +360,16 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/print.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/pstar.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/pstar.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/gud/rcont.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/gud/recstart.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/gud/recstop.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/remove.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/remove.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/gud/rfinish.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/gud/rnext.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/gud/rnexti.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/gud/rstep.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/gud/rstepi.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/run.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/run.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/step.pbm
@@ -370,6 +378,7 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/stepi.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/stop.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/stop.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/gud/thread.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/until.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/until.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gud/up.pbm
@@ -460,6 +469,15 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/send.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/spam.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mh-logo.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/mpc/README
+%%DATADIR%%/%%EMACS_VER%%/etc/images/mpc/add.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/mpc/ffwd.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/mpc/next.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/mpc/pause.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/mpc/play.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/mpc/prev.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/mpc/rewind.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/mpc/stop.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/new.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/new.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/next-node.pbm
@@ -1123,6 +1141,297 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/case-table.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/cdl.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/cdl.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/cedet-cscope.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/cedet-cscope.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/cedet-files.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/cedet-files.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/cedet-global.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/cedet-global.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/cedet-idutils.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/cedet-idutils.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/cedet.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/cedet.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/data-debug.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/data-debug.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/autoconf-edit.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/autoconf-edit.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/cpp-root.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/cpp-root.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/dired.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/dired.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/emacs.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/emacs.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/files.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/files.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/linux.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/linux.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/loaddefs.el
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/locate.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/locate.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/make.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/make.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/makefile-edit.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/makefile-edit.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/pconf.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/pconf.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/pmake.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/pmake.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-archive.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-archive.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-aux.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-aux.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-comp.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-comp.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-elisp.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-elisp.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-info.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-info.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-misc.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-misc.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-obj.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-obj.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-prog.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-prog.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-scheme.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-scheme.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-shared.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj-shared.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/proj.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/project-am.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/project-am.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/shell.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/shell.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/simple.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/simple.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/source.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/source.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/speedbar.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/speedbar.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/srecode.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/srecode.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/system.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/system.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/util.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/util.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/inversion.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/inversion.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/mode-local.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/mode-local.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/pulse.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/pulse.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/analyze.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/analyze.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/analyze/complete.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/analyze/complete.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/analyze/debug.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/analyze/debug.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/analyze/fcn.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/analyze/fcn.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/analyze/refs.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/analyze/refs.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine/c-by.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine/c-by.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine/c.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine/c.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine/debug.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine/debug.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine/el.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine/el.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine/gcc.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine/gcc.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine/make-by.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine/make-by.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine/make.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine/make.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine/scm-by.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine/scm-by.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine/scm.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine/scm.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/chart.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/chart.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/complete.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/complete.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/ctxt.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/ctxt.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-debug.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-debug.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-ebrowse.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-ebrowse.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-el.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-el.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-file.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-file.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-find.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-find.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-global.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-global.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-javascript.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-javascript.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-mode.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-mode.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-ref.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-ref.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-typecache.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db-typecache.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/db.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/debug.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/debug.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/decorate.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/decorate.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/decorate/include.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/decorate/include.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/decorate/mode.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/decorate/mode.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/dep.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/dep.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/doc.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/doc.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/ede-grammar.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/ede-grammar.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/edit.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/edit.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/find.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/find.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/format.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/format.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/fw.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/fw.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/grammar-wy.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/grammar-wy.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/grammar.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/grammar.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/html.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/html.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/ia-sb.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/ia-sb.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/ia.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/ia.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/idle.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/idle.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/imenu.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/imenu.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/java.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/java.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/lex-spp.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/lex-spp.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/lex.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/lex.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/loaddefs.el
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/mru-bookmark.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/mru-bookmark.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/sb.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/sb.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/scope.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/scope.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/senator.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/senator.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/sort.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/sort.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/symref.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/symref.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/symref/cscope.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/symref/cscope.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/symref/filter.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/symref/filter.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/symref/global.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/symref/global.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/symref/grep.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/symref/grep.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/symref/idutils.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/symref/idutils.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/symref/list.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/symref/list.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/tag-file.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/tag-file.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/tag-ls.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/tag-ls.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/tag-write.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/tag-write.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/tag.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/tag.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/texi.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/texi.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/util-modes.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/util-modes.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/util.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/util.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/wisent.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/wisent.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/wisent/comp.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/wisent/comp.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/wisent/java-tags.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/wisent/java-tags.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/wisent/javascript.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/wisent/javascript.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/wisent/javat-wy.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/wisent/javat-wy.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/wisent/js-wy.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/wisent/js-wy.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/wisent/python-wy.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/wisent/python-wy.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/wisent/python.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/wisent/python.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/wisent/wisent.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/wisent/wisent.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/args.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/args.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/compile.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/compile.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/cpp.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/cpp.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/ctxt.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/ctxt.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/dictionary.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/dictionary.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/document.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/document.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/el.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/el.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/expandproto.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/expandproto.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/extract.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/extract.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/fields.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/fields.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/filters.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/filters.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/find.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/find.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/getset.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/getset.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/insert.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/insert.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/java.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/java.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/loaddefs.el
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/map.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/map.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/mode.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/mode.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/semantic.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/semantic.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/srt-mode.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/srt-mode.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/srt-wy.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/srt-wy.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/srt.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/srt.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/table.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/table.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/template.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/template.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/texi.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode/texi.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/chistory.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/chistory.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/cmuscheme.el.gz
@@ -1246,6 +1555,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/byte-run.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/bytecomp.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/bytecomp.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/chart.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/chart.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/check-declare.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/check-declare.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/checkdoc.el.gz
@@ -1282,6 +1593,20 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/easymenu.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/edebug.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/edebug.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-base.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-base.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-comp.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-comp.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-custom.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-custom.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-datadebug.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-datadebug.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-opt.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-opt.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-speedbar.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-speedbar.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eldoc.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eldoc.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/elint.el.gz
@@ -1302,8 +1627,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/gulp.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/helper.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/helper.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/levents.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/levents.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/lisp-mnt.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/lisp-mnt.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/lisp-mode.el.gz
@@ -1312,8 +1635,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/lisp.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/lmenu.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/lmenu.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/lucid.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/lucid.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/macroexp.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/macroexp.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/map-ynp.el.gz
@@ -1565,6 +1886,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/ffap.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/filecache.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/filecache.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/files-x.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/files-x.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/files.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/files.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/filesets.el.gz
@@ -1590,6 +1913,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/font-core.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/font-lock.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/font-lock.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/font-setting.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/font-setting.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/format-spec.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/format-spec.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/format.el.gz
@@ -1884,6 +2209,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/hex-util.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/hexl.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/hexl.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/hfy-cmap.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/hfy-cmap.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/hi-lock.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/hi-lock.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/hilit-chg.el.gz
@@ -1892,6 +2219,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/hippie-exp.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/hl-line.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/hl-line.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/htmlfontify.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/htmlfontify.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/ibuf-ext.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/ibuf-ext.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/ibuf-macs.el.gz
@@ -1933,8 +2262,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/characters.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/charprop.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/cp51932.el
-%%DATADIR%%/%%EMACS_VER%%/lisp/international/encoded-kb.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/international/encoded-kb.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/eucjp-ms.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/fontset.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/fontset.elc
@@ -1960,7 +2287,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/latin1-disp.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/mule-cmds.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/mule-cmds.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/international/mule-conf.el
+%%DATADIR%%/%%EMACS_VER%%/lisp/international/mule-conf.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/international/mule-conf.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/mule-diag.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/mule-diag.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/mule-util.el.gz
@@ -1975,6 +2303,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/robin.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/titdic-cnv.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/titdic-cnv.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/international/ucs-normalize.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/international/ucs-normalize.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/uni-bidi.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/uni-category.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/uni-combining.el
@@ -2237,6 +2567,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/mouse-sel.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mouse.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mouse.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mpc.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mpc.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/msb.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/msb.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mwheel.el.gz
@@ -2275,6 +2607,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/hmac-def.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/hmac-md5.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/hmac-md5.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/imap-hash.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/imap-hash.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/imap.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/imap.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/ldap.el.gz
@@ -2333,8 +2667,12 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-fish.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-ftp.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-ftp.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-gvfs.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-gvfs.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-gw.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-gw.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-imap.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-imap.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-smb.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-smb.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-uu.el.gz
@@ -2415,6 +2753,10 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/keyswap.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/lazy-lock.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/lazy-lock.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/levents.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/levents.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/lucid.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/lucid.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/old-whitespace.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/old-whitespace.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/options.el.gz
@@ -2431,6 +2773,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/scribe.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/swedish.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/swedish.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sym-comp.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sym-comp.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-mcvs.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-mcvs.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/x-menu.el.gz
@@ -2439,6 +2783,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-agenda.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-archive.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-archive.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-ascii.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-ascii.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-attach.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-attach.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-bbdb.el.gz
@@ -2451,26 +2797,48 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-colview.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-compat.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-compat.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-crypt.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-crypt.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-datetree.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-datetree.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-docbook.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-docbook.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-exp-blocks.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-exp-blocks.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-exp.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-exp.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-export-latex.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-export-latex.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-faces.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-faces.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-feed.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-feed.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-footnote.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-footnote.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-freemind.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-freemind.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-gnus.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-gnus.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-habit.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-habit.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-html.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-html.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-icalendar.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-icalendar.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-id.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-id.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-indent.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-indent.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-info.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-info.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-inlinetask.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-inlinetask.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-install.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-install.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-irc.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-irc.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-jsinfo.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-jsinfo.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-latex.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-latex.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-list.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-list.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-mac-message.el.gz
@@ -2481,16 +2849,22 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-mew.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-mhe.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-mhe.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-mobile.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-mobile.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-mouse.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-mouse.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-plot.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-plot.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-protocol.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-protocol.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-publish.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-publish.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-remember.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-remember.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-rmail.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-rmail.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-src.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-src.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-table.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-table.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-timer.el.gz
@@ -2501,6 +2875,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-w3m.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-wl.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-wl.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-xoxo.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-xoxo.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/outline.el.gz
@@ -2648,8 +3024,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-styles.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-styles.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-subword.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-subword.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-vars.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-vars.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cfengine.el.gz
@@ -2722,6 +3096,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/idlwave.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/inf-lisp.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/inf-lisp.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/js.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/js.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/ld-script.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/ld-script.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/m4-mode.el.gz
@@ -2760,8 +3136,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/simula.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/sql.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/sql.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/sym-comp.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/sym-comp.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/subword.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/subword.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/tcl.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/tcl.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/vera-mode.el.gz
@@ -3161,6 +3537,7 @@ share/applications/emacs.desktop
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/blockinput.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/buffer.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/buffer.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/buildobj.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/bytecode.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/callint.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/callproc.c
@@ -3324,9 +3701,13 @@ share/applications/emacs.desktop
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xfns.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xfont.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xftfont.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xgselect.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xgselect.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xmenu.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xrdb.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xselect.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xsettings.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xsettings.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xsmfns.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xterm.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xterm.h
@@ -3364,6 +3745,15 @@ var/games/emacs/tetris-scores
 @dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/erc
 @dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/emulation
 @dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp
+@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/srecode
+@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/wisent
+@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/symref
+@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/decorate
+@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/bovine
+@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/analyze
+@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic
+@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede
+@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/cedet
 @dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/calendar
 @dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/calc
 @dirrm %%DATADIR%%/%%EMACS_VER%%/lisp
@@ -3380,6 +3770,7 @@ var/games/emacs/tetris-scores
 @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/medium
 @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/grayscale
 @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies
+@dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/mpc
 @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/mail
 @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/low-color
 @dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images/icons/hicolor/scalable/mimetypes