Hi,

Manuel Giraud <man...@ledu-giraud.fr> writes:

> Lightly tested on amd64 all flavors. One can now M-x eww and profit.

Used daily on i386 and amd64 for one month.  Lightly tested on sparc64.

I had not sent the diff earlier because I had problems (hangs at exit
time) with the graphical (gtk3) flavor and d-bus.  Probably a PEBKAC
case since I can't reproduce it anymore. :)

There are a few differences with your diff:
- emacs links against zlib now
- it's easier to just copy-paste the output from port-lib-depends-check
  for each graphical flavor
- keep .el files compressed, as the size increase is significant (40MB)

I've noticed a regression with desktop-save-mode and alternating between
text and gui sessions: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17352
I don't think this is a blocking problem.

I could use test reports on !(i386|amd64|sparc64).

Index: Makefile
===================================================================
RCS file: /cvs/ports/editors/emacs/Makefile,v
retrieving revision 1.48
diff -u -p -r1.48 Makefile
--- Makefile    1 Nov 2014 14:19:32 -0000       1.48
+++ Makefile    27 Nov 2014 13:24:23 -0000
@@ -2,9 +2,8 @@
 
 COMMENT=               GNU editor: extensible, customizable, self-documenting
 
-VERSION=               24.3
+VERSION=               24.4
 DISTNAME=              emacs-${VERSION}
-REVISION=              5
 
 CATEGORIES=            editors
 
@@ -15,7 +14,7 @@ MAINTAINER=           Jeremie Courreges-Anglas <j
 # GPLv3+
 PERMIT_PACKAGE_CDROM=  Yes
 
-WANTLIB=               c m ncurses pthread execinfo gnutls xml2
+WANTLIB=               c m ncurses pthread execinfo gnutls xml2 z
 
 MASTER_SITES=          ${MASTER_SITE_GNU:=emacs/}
 
@@ -26,11 +25,9 @@ FLAVOR?=             gtk3
 
 GCCARCH=               ${MACHINE_ARCH}-unknown-openbsd
 
-CONFIGURE_STYLE=       autoconf
-AUTOCONF_VERSION=      2.69
+CONFIGURE_STYLE=       gnu
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/build-aux
 CONFIGURE_ARGS=                --build="${GCCARCH}" \
-                       --without-compress-info \
                        --without-sound
 
 CONFIGURE_ENV=         CPPFLAGS="-I${LOCALBASE}/include" \
@@ -43,13 +40,16 @@ MAKE_ENV=           INSTALL_EMACS="${INSTALL_SCRI
 SUBST_VARS=            GCCARCH VERSION
 
 MODULES=               devel/gettext
-LIB_DEPENDS=           devel/libexecinfo security/gnutls textproc/libxml
+LIB_DEPENDS=           devel/libexecinfo \
+                       security/gnutls \
+                       textproc/libxml
 
 .if ${FLAVOR} == "no_x11"
 CONFIGURE_ARGS+=       --without-x \
                        --without-dbus \
                        --without-gconf \
-                       --without-gsettings
+                       --without-gsettings \
+                       --without-file-notification
 .else
 LIB_DEPENDS+=          x11/dbus \
                        x11/gnome/librsvg \
@@ -62,27 +62,30 @@ LIB_DEPENDS+=               x11/dbus \
 RUN_DEPENDS+=          devel/desktop-file-utils \
                        devel/xdg-utils \
                        x11/gtk+2,-guic
-WANTLIB+=              dbus-1 rsvg-2 gio-2.0 gdk_pixbuf-2.0 gobject-2.0 \
-                       glib-2.0 gconf-2 cairo png jpeg tiff gif z \
-                       MagickWand MagickCore
 . if ${FLAVOR} == "athena"
 CONFIGURE_ARGS+=       --with-x-toolkit=athena
 LIB_DEPENDS+=          x11/Xaw3d
-WANTLIB+=              ICE SM X11 Xaw3d Xext Xft Xmu Xpm Xrender Xt \
-                       expat fontconfig freetype
+WANTLIB += ICE MagickCore MagickWand SM X11 Xaw3d Xext Xft Xinerama
+WANTLIB += Xmu Xpm Xrandr Xrender Xt cairo dbus-1 fontconfig freetype
+WANTLIB += gconf-2 gdk_pixbuf-2.0 gif gio-2.0 glib-2.0 gobject-2.0
+WANTLIB += jpeg png rsvg-2 tiff
 . elif ${FLAVOR} == "gtk2"
 CONFIGURE_ARGS+=       --with-x-toolkit=gtk2
 LIB_DEPENDS+=          x11/gtk+2
-WANTLIB+=              ICE SM X11 Xcomposite Xcursor Xdamage Xext \
-                       Xfixes Xft Xi Xinerama Xpm Xrandr Xrender \
-                       atk-1.0 expat fontconfig freetype gdk-x11-2.0 \
-                       gtk-x11-2.0 pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB += ICE MagickCore MagickWand SM X11 Xcomposite Xcursor
+WANTLIB += Xdamage Xext Xfixes Xft Xi Xinerama Xpm Xrandr Xrender
+WANTLIB += atk-1.0 cairo dbus-1 fontconfig freetype gconf-2 gdk-x11-2.0
+WANTLIB += gdk_pixbuf-2.0 gif gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0
+WANTLIB += jpeg pango-1.0 pangocairo-1.0 pangoft2-1.0 png rsvg-2
+WANTLIB += tiff
 . elif ${FLAVOR} == "gtk3"
 CONFIGURE_ARGS+=       --with-x-toolkit=gtk3
 LIB_DEPENDS+=          x11/gtk+3
-WANTLIB+=              ICE SM X11 Xft Xpm Xrender atk-1.0 cairo-gobject \
-                       expat fontconfig freetype gdk-3 gtk-3 pango-1.0 \
-                       pangocairo-1.0 pangoft2-1.0
+WANTLIB += ICE MagickCore MagickWand SM X11 Xft Xinerama Xpm Xrandr
+WANTLIB += Xrender atk-1.0 cairo cairo-gobject dbus-1 fontconfig
+WANTLIB += freetype gconf-2 gdk-3 gdk_pixbuf-2.0 gif gio-2.0 glib-2.0
+WANTLIB += gobject-2.0 gtk-3 jpeg pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB += png rsvg-2 tiff
 . else
 ERRORS+=               "Fatal: Conflicting flavor: ${FLAVOR}"
 . endif
Index: distinfo
===================================================================
RCS file: /cvs/ports/editors/emacs/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo    7 May 2013 07:06:42 -0000       1.5
+++ distinfo    10 Nov 2014 18:34:51 -0000
@@ -1,2 +1,2 @@
-SHA256 (emacs-24.3.tar.gz) = AJjKMgSBPWnNhBIEW6M+hwH6IGL0v/Vr7a/AZJee70E=
-SIZE (emacs-24.3.tar.gz) = 52543898
+SHA256 (emacs-24.4.tar.gz) = qTxPGvpa3mWgyXI5dfCl/fZkHMRjj9r7PtmULCPDLMY=
+SIZE (emacs-24.4.tar.gz) = 59020082
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile_in   27 Nov 2014 10:24:55 -0000
@@ -0,0 +1,24 @@
+$OpenBSD$
+
+- don't compress man and info pages.
+
+--- Makefile.in.orig   Sat Jul 12 19:46:56 2014
++++ Makefile.in        Thu Nov 27 10:53:20 2014
+@@ -665,7 +664,7 @@ install-info: info
+             for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
+              (cd "$${thisdir}"; \
+               ${INSTALL_DATA} ${srcdir}/info/$$f "$(DESTDIR)${infodir}/$$f"); 
\
+-              [ -n "${GZIP_PROG}" ] || continue ; \
++              [ -n "" ] || continue ; \
+               rm -f "$(DESTDIR)${infodir}/$$f.gz"; \
+               ${GZIP_PROG} -9n "$(DESTDIR)${infodir}/$$f"; \
+             done; \
+@@ -688,7 +687,7 @@ install-man:
+         dest=`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1; \
+         (cd "$${thisdir}"; \
+          ${INSTALL_DATA} ${mansrcdir}/$${page} 
"$(DESTDIR)${man1dir}/$${dest}"); \
+-        [ -n "${GZIP_PROG}" ] || continue ; \
++        [ -n "" ] || continue ; \
+         rm -f "$(DESTDIR)${man1dir}/$${dest}.gz"; \
+         ${GZIP_PROG} -9n "$(DESTDIR)${man1dir}/$${dest}" || true; \
+       done
Index: patches/patch-configure_ac
===================================================================
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- patches/patch-configure_ac  25 Sep 2013 07:56:57 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.1 2013/09/25 07:56:57 sthen Exp $
-
-quick hack for compat with giflib 5.0+; emacs is actually checking for "giflib
-newer than 4.1.0b1" by using a check for a function which was added then (see
-http://lists.gnu.org/archive/html/emacs-devel/2002-08/msg00417.html) but
-that function has since been removed.
-
---- configure.ac.orig  Thu Sep 19 14:05:18 2013
-+++ configure.ac       Thu Sep 19 14:05:37 2013
-@@ -2661,7 +2661,7 @@ if test "${HAVE_X11}" = "yes" && test "${with_gif}" !=
-   AC_CHECK_HEADER(gif_lib.h,
- # EGifPutExtensionLast only exists from version libungif-4.1.0b1.
- # Earlier versions can crash Emacs.
--    [AC_CHECK_LIB(gif, EGifPutExtensionLast, HAVE_GIF=yes, HAVE_GIF=maybe)])
-+    [AC_CHECK_LIB(gif, EGifPutExtensionBlock, HAVE_GIF=yes, HAVE_GIF=maybe)])
- 
-   if test "$HAVE_GIF" = yes; then
-     LIBGIF=-lgif
Index: patches/patch-src_image_c
===================================================================
RCS file: patches/patch-src_image_c
diff -N patches/patch-src_image_c
--- patches/patch-src_image_c   25 Sep 2013 07:56:57 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-$OpenBSD: patch-src_image_c,v 1.1 2013/09/25 07:56:57 sthen Exp $
-
-handle giflib 5.0+
-
---- src/image.c.orig   Thu Sep 19 14:37:38 2013
-+++ src/image.c        Thu Sep 19 14:38:05 2013
-@@ -7192,7 +7192,7 @@ gif_load (struct frame *f, struct image *img)
-       }
- 
-       /* Open the GIF file.  */
--      gif = fn_DGifOpenFileName (SSDATA (file));
-+      gif = fn_DGifOpenFileName (SSDATA (file), NULL);
-       if (gif == NULL)
-       {
-         image_error ("Cannot open `%s'", file, Qnil);
-@@ -7213,7 +7213,7 @@ gif_load (struct frame *f, struct image *img)
-       memsrc.len = SBYTES (specified_data);
-       memsrc.index = 0;
- 
--      gif = fn_DGifOpen (&memsrc, gif_read_from_memory);
-+      gif = fn_DGifOpen (&memsrc, gif_read_from_memory, NULL);
-       if (!gif)
-       {
-         image_error ("Cannot open memory source `%s'", img->spec, Qnil);
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/editors/emacs/pkg/PLIST,v
retrieving revision 1.14
diff -u -p -r1.14 PLIST
--- pkg/PLIST   9 Jan 2014 14:53:29 -0000       1.14
+++ pkg/PLIST   27 Nov 2014 10:29:17 -0000
@@ -40,17 +40,20 @@ bin/grep-changelog
 @info info/ert.info
 @info info/eshell.info
 @info info/eudc.info
+@info info/eww.info
 @info info/flymake.info
 @info info/forms.info
 @info info/gnus.info
 @info info/htmlfontify.info
 @info info/idlwave.info
+@info info/ido.info
 @info info/info.info
 @info info/mairix-el.info
 @info info/message.info
 @info info/mh-e.info
 @info info/newsticker.info
 @info info/nxml-mode.info
+@info info/octave-mode.info
 @info info/org.info
 @info info/pcl-cvs.info
 @info info/pgg.info
@@ -65,6 +68,7 @@ bin/grep-changelog
 @info info/smtpmail.info
 @info info/speedbar.info
 @info info/srecode.info
+@info info/todo-mode.info
 @info info/tramp.info
 @info info/url.info
 @info info/vip.info
@@ -90,14 +94,14 @@ share/doc/pkg-readmes/${FULLPKGNAME}
 share/emacs/${VERSION}/
 share/emacs/${VERSION}/etc/
 share/emacs/${VERSION}/etc/AUTHORS
+share/emacs/${VERSION}/etc/CALC-NEWS
 share/emacs/${VERSION}/etc/CENSORSHIP
 share/emacs/${VERSION}/etc/CONTRIBUTE
-share/emacs/${VERSION}/etc/COOKIES
 share/emacs/${VERSION}/etc/COPYING
 share/emacs/${VERSION}/etc/DEBUG
 share/emacs/${VERSION}/etc/DEVEL.HUMOR
 share/emacs/${VERSION}/etc/DISTRIB
-share/emacs/${VERSION}/etc/DOC-${VERSION}.1
+share/emacs/${VERSION}/etc/DOC
 share/emacs/${VERSION}/etc/ERC-NEWS
 share/emacs/${VERSION}/etc/ETAGS.EBNF
 share/emacs/${VERSION}/etc/ETAGS.README
@@ -105,14 +109,11 @@ share/emacs/${VERSION}/etc/FTP
 share/emacs/${VERSION}/etc/GNU
 share/emacs/${VERSION}/etc/GNUS-NEWS
 share/emacs/${VERSION}/etc/HELLO
-share/emacs/${VERSION}/etc/INTERVIEW
 share/emacs/${VERSION}/etc/JOKES
 share/emacs/${VERSION}/etc/LINUX-GNU
 share/emacs/${VERSION}/etc/MACHINES
-share/emacs/${VERSION}/etc/MAILINGLISTS
 share/emacs/${VERSION}/etc/MH-E-NEWS
 share/emacs/${VERSION}/etc/MORE.STUFF
-share/emacs/${VERSION}/etc/MOTIVATION
 share/emacs/${VERSION}/etc/NEWS
 share/emacs/${VERSION}/etc/NEWS.1-17
 share/emacs/${VERSION}/etc/NEWS.18
@@ -127,12 +128,10 @@ share/emacs/${VERSION}/etc/ORDERS
 share/emacs/${VERSION}/etc/ORG-NEWS
 share/emacs/${VERSION}/etc/PROBLEMS
 share/emacs/${VERSION}/etc/README
-share/emacs/${VERSION}/etc/SERVICE
 share/emacs/${VERSION}/etc/TERMS
 share/emacs/${VERSION}/etc/THE-GNU-PROJECT
 share/emacs/${VERSION}/etc/TODO
 share/emacs/${VERSION}/etc/WHY-FREE
-share/emacs/${VERSION}/etc/celibacy.1
 share/emacs/${VERSION}/etc/charsets/
 share/emacs/${VERSION}/etc/charsets/8859-10.map
 share/emacs/${VERSION}/etc/charsets/8859-11.map
@@ -267,18 +266,16 @@ share/emacs/${VERSION}/etc/charsets/VSCI
 share/emacs/${VERSION}/etc/charsets/stdenc.map
 share/emacs/${VERSION}/etc/charsets/symbol.map
 share/emacs/${VERSION}/etc/compilation.txt
-share/emacs/${VERSION}/etc/condom.1
-share/emacs/${VERSION}/etc/copying.paper
 share/emacs/${VERSION}/etc/e/
 share/emacs/${VERSION}/etc/e/README
 share/emacs/${VERSION}/etc/e/eterm-color
 share/emacs/${VERSION}/etc/e/eterm-color.ti
-share/emacs/${VERSION}/etc/echo.msg
 share/emacs/${VERSION}/etc/edt-user.el
 share/emacs/${VERSION}/etc/emacs-buffer.gdb
+share/emacs/${VERSION}/etc/emacs.appdata.xml
 share/emacs/${VERSION}/etc/emacs.desktop
 share/emacs/${VERSION}/etc/emacs.icon
-share/emacs/${VERSION}/etc/enriched.doc
+share/emacs/${VERSION}/etc/enriched.txt
 share/emacs/${VERSION}/etc/forms/
 share/emacs/${VERSION}/etc/forms/README
 share/emacs/${VERSION}/etc/forms/forms-d2.dat
@@ -887,6 +884,7 @@ share/emacs/${VERSION}/etc/org/
 share/emacs/${VERSION}/etc/org/OrgOdtContentTemplate.xml
 share/emacs/${VERSION}/etc/org/OrgOdtStyles.xml
 share/emacs/${VERSION}/etc/org/README
+share/emacs/${VERSION}/etc/package-keyring.gpg
 share/emacs/${VERSION}/etc/ps-prin0.ps
 share/emacs/${VERSION}/etc/ps-prin1.ps
 share/emacs/${VERSION}/etc/publicsuffix.txt
@@ -899,6 +897,7 @@ share/emacs/${VERSION}/etc/refcards/cs-d
 share/emacs/${VERSION}/etc/refcards/cs-dired-ref.tex
 share/emacs/${VERSION}/etc/refcards/cs-refcard.pdf
 share/emacs/${VERSION}/etc/refcards/cs-refcard.tex
+share/emacs/${VERSION}/etc/refcards/cs-survival.pdf
 share/emacs/${VERSION}/etc/refcards/cs-survival.tex
 share/emacs/${VERSION}/etc/refcards/de-refcard.pdf
 share/emacs/${VERSION}/etc/refcards/de-refcard.tex
@@ -909,6 +908,7 @@ share/emacs/${VERSION}/etc/refcards/fr-d
 share/emacs/${VERSION}/etc/refcards/fr-dired-ref.tex
 share/emacs/${VERSION}/etc/refcards/fr-refcard.pdf
 share/emacs/${VERSION}/etc/refcards/fr-refcard.tex
+share/emacs/${VERSION}/etc/refcards/fr-survival.pdf
 share/emacs/${VERSION}/etc/refcards/fr-survival.tex
 share/emacs/${VERSION}/etc/refcards/gnus-booklet.pdf
 share/emacs/${VERSION}/etc/refcards/gnus-logo.eps
@@ -930,9 +930,13 @@ share/emacs/${VERSION}/etc/refcards/sk-d
 share/emacs/${VERSION}/etc/refcards/sk-dired-ref.tex
 share/emacs/${VERSION}/etc/refcards/sk-refcard.pdf
 share/emacs/${VERSION}/etc/refcards/sk-refcard.tex
+share/emacs/${VERSION}/etc/refcards/sk-survival.pdf
 share/emacs/${VERSION}/etc/refcards/sk-survival.tex
+share/emacs/${VERSION}/etc/refcards/survival.pdf
 share/emacs/${VERSION}/etc/refcards/survival.tex
+share/emacs/${VERSION}/etc/refcards/vipcard.pdf
 share/emacs/${VERSION}/etc/refcards/vipcard.tex
+share/emacs/${VERSION}/etc/refcards/viperCard.pdf
 share/emacs/${VERSION}/etc/refcards/viperCard.tex
 share/emacs/${VERSION}/etc/rgb.txt
 share/emacs/${VERSION}/etc/schema/
@@ -983,7 +987,6 @@ share/emacs/${VERSION}/etc/schema/xhtml-
 share/emacs/${VERSION}/etc/schema/xhtml.rnc
 share/emacs/${VERSION}/etc/schema/xslt.rnc
 share/emacs/${VERSION}/etc/ses-example.ses
-share/emacs/${VERSION}/etc/sex.6
 share/emacs/${VERSION}/etc/spook.lines
 share/emacs/${VERSION}/etc/srecode/
 share/emacs/${VERSION}/etc/srecode/c.srt
@@ -1006,6 +1009,7 @@ share/emacs/${VERSION}/etc/themes/
 share/emacs/${VERSION}/etc/themes/adwaita-theme.el
 share/emacs/${VERSION}/etc/themes/deeper-blue-theme.el
 share/emacs/${VERSION}/etc/themes/dichromacy-theme.el
+share/emacs/${VERSION}/etc/themes/leuven-theme.el
 share/emacs/${VERSION}/etc/themes/light-blue-theme.el
 share/emacs/${VERSION}/etc/themes/manoj-dark-theme.el
 share/emacs/${VERSION}/etc/themes/misterioso-theme.el
@@ -1041,130 +1045,6 @@ share/emacs/${VERSION}/etc/tutorials/TUT
 share/emacs/${VERSION}/etc/tutorials/TUTORIAL.translators
 share/emacs/${VERSION}/etc/tutorials/TUTORIAL.zh
 share/emacs/${VERSION}/etc/yow.lines
-share/emacs/${VERSION}/leim/
-share/emacs/${VERSION}/leim/ja-dic/
-share/emacs/${VERSION}/leim/ja-dic/ja-dic.el.gz
-share/emacs/${VERSION}/leim/ja-dic/ja-dic.elc
-share/emacs/${VERSION}/leim/leim-list.el
-share/emacs/${VERSION}/leim/quail/
-share/emacs/${VERSION}/leim/quail/4Corner.el.gz
-share/emacs/${VERSION}/leim/quail/4Corner.elc
-share/emacs/${VERSION}/leim/quail/ARRAY30.el.gz
-share/emacs/${VERSION}/leim/quail/ARRAY30.elc
-share/emacs/${VERSION}/leim/quail/CCDOSPY.el.gz
-share/emacs/${VERSION}/leim/quail/CCDOSPY.elc
-share/emacs/${VERSION}/leim/quail/CTLau-b5.el.gz
-share/emacs/${VERSION}/leim/quail/CTLau-b5.elc
-share/emacs/${VERSION}/leim/quail/CTLau.el.gz
-share/emacs/${VERSION}/leim/quail/CTLau.elc
-share/emacs/${VERSION}/leim/quail/ECDICT.el.gz
-share/emacs/${VERSION}/leim/quail/ECDICT.elc
-share/emacs/${VERSION}/leim/quail/ETZY.el.gz
-share/emacs/${VERSION}/leim/quail/ETZY.elc
-share/emacs/${VERSION}/leim/quail/PY-b5.el.gz
-share/emacs/${VERSION}/leim/quail/PY-b5.elc
-share/emacs/${VERSION}/leim/quail/PY.el.gz
-share/emacs/${VERSION}/leim/quail/PY.elc
-share/emacs/${VERSION}/leim/quail/Punct-b5.el.gz
-share/emacs/${VERSION}/leim/quail/Punct-b5.elc
-share/emacs/${VERSION}/leim/quail/Punct.el.gz
-share/emacs/${VERSION}/leim/quail/Punct.elc
-share/emacs/${VERSION}/leim/quail/QJ-b5.el.gz
-share/emacs/${VERSION}/leim/quail/QJ-b5.elc
-share/emacs/${VERSION}/leim/quail/QJ.el.gz
-share/emacs/${VERSION}/leim/quail/QJ.elc
-share/emacs/${VERSION}/leim/quail/SW.el.gz
-share/emacs/${VERSION}/leim/quail/SW.elc
-share/emacs/${VERSION}/leim/quail/TONEPY.el.gz
-share/emacs/${VERSION}/leim/quail/TONEPY.elc
-share/emacs/${VERSION}/leim/quail/ZIRANMA.el.gz
-share/emacs/${VERSION}/leim/quail/ZIRANMA.elc
-share/emacs/${VERSION}/leim/quail/ZOZY.el.gz
-share/emacs/${VERSION}/leim/quail/ZOZY.elc
-share/emacs/${VERSION}/leim/quail/arabic.el.gz
-share/emacs/${VERSION}/leim/quail/arabic.elc
-share/emacs/${VERSION}/leim/quail/croatian.el.gz
-share/emacs/${VERSION}/leim/quail/croatian.elc
-share/emacs/${VERSION}/leim/quail/cyril-jis.el.gz
-share/emacs/${VERSION}/leim/quail/cyril-jis.elc
-share/emacs/${VERSION}/leim/quail/cyrillic.el.gz
-share/emacs/${VERSION}/leim/quail/cyrillic.elc
-share/emacs/${VERSION}/leim/quail/czech.el.gz
-share/emacs/${VERSION}/leim/quail/czech.elc
-share/emacs/${VERSION}/leim/quail/ethiopic.el.gz
-share/emacs/${VERSION}/leim/quail/ethiopic.elc
-share/emacs/${VERSION}/leim/quail/georgian.el.gz
-share/emacs/${VERSION}/leim/quail/georgian.elc
-share/emacs/${VERSION}/leim/quail/greek.el.gz
-share/emacs/${VERSION}/leim/quail/greek.elc
-share/emacs/${VERSION}/leim/quail/hangul.el.gz
-share/emacs/${VERSION}/leim/quail/hangul.elc
-share/emacs/${VERSION}/leim/quail/hanja-jis.el.gz
-share/emacs/${VERSION}/leim/quail/hanja-jis.elc
-share/emacs/${VERSION}/leim/quail/hanja.el.gz
-share/emacs/${VERSION}/leim/quail/hanja.elc
-share/emacs/${VERSION}/leim/quail/hanja3.el.gz
-share/emacs/${VERSION}/leim/quail/hanja3.elc
-share/emacs/${VERSION}/leim/quail/hebrew.el.gz
-share/emacs/${VERSION}/leim/quail/hebrew.elc
-share/emacs/${VERSION}/leim/quail/indian.el.gz
-share/emacs/${VERSION}/leim/quail/indian.elc
-share/emacs/${VERSION}/leim/quail/ipa-praat.el.gz
-share/emacs/${VERSION}/leim/quail/ipa-praat.elc
-share/emacs/${VERSION}/leim/quail/ipa.el.gz
-share/emacs/${VERSION}/leim/quail/ipa.elc
-share/emacs/${VERSION}/leim/quail/japanese.el.gz
-share/emacs/${VERSION}/leim/quail/japanese.elc
-share/emacs/${VERSION}/leim/quail/lao.el.gz
-share/emacs/${VERSION}/leim/quail/lao.elc
-share/emacs/${VERSION}/leim/quail/latin-alt.el.gz
-share/emacs/${VERSION}/leim/quail/latin-alt.elc
-share/emacs/${VERSION}/leim/quail/latin-ltx.el.gz
-share/emacs/${VERSION}/leim/quail/latin-ltx.elc
-share/emacs/${VERSION}/leim/quail/latin-post.el.gz
-share/emacs/${VERSION}/leim/quail/latin-post.elc
-share/emacs/${VERSION}/leim/quail/latin-pre.el.gz
-share/emacs/${VERSION}/leim/quail/latin-pre.elc
-share/emacs/${VERSION}/leim/quail/lrt.el.gz
-share/emacs/${VERSION}/leim/quail/lrt.elc
-share/emacs/${VERSION}/leim/quail/persian.el.gz
-share/emacs/${VERSION}/leim/quail/persian.elc
-share/emacs/${VERSION}/leim/quail/py-punct.el.gz
-share/emacs/${VERSION}/leim/quail/py-punct.elc
-share/emacs/${VERSION}/leim/quail/pypunct-b5.el.gz
-share/emacs/${VERSION}/leim/quail/pypunct-b5.elc
-share/emacs/${VERSION}/leim/quail/quick-b5.el.gz
-share/emacs/${VERSION}/leim/quail/quick-b5.elc
-share/emacs/${VERSION}/leim/quail/quick-cns.el.gz
-share/emacs/${VERSION}/leim/quail/quick-cns.elc
-share/emacs/${VERSION}/leim/quail/rfc1345.el.gz
-share/emacs/${VERSION}/leim/quail/rfc1345.elc
-share/emacs/${VERSION}/leim/quail/sgml-input.el.gz
-share/emacs/${VERSION}/leim/quail/sgml-input.elc
-share/emacs/${VERSION}/leim/quail/sisheng.el.gz
-share/emacs/${VERSION}/leim/quail/sisheng.elc
-share/emacs/${VERSION}/leim/quail/slovak.el.gz
-share/emacs/${VERSION}/leim/quail/slovak.elc
-share/emacs/${VERSION}/leim/quail/symbol-ksc.el.gz
-share/emacs/${VERSION}/leim/quail/symbol-ksc.elc
-share/emacs/${VERSION}/leim/quail/thai.el.gz
-share/emacs/${VERSION}/leim/quail/thai.elc
-share/emacs/${VERSION}/leim/quail/tibetan.el.gz
-share/emacs/${VERSION}/leim/quail/tibetan.elc
-share/emacs/${VERSION}/leim/quail/tsang-b5.el.gz
-share/emacs/${VERSION}/leim/quail/tsang-b5.elc
-share/emacs/${VERSION}/leim/quail/tsang-cns.el.gz
-share/emacs/${VERSION}/leim/quail/tsang-cns.elc
-share/emacs/${VERSION}/leim/quail/uni-input.el.gz
-share/emacs/${VERSION}/leim/quail/uni-input.elc
-share/emacs/${VERSION}/leim/quail/viqr.el.gz
-share/emacs/${VERSION}/leim/quail/viqr.elc
-share/emacs/${VERSION}/leim/quail/vntelex.el.gz
-share/emacs/${VERSION}/leim/quail/vntelex.elc
-share/emacs/${VERSION}/leim/quail/vnvni.el.gz
-share/emacs/${VERSION}/leim/quail/vnvni.elc
-share/emacs/${VERSION}/leim/quail/welsh.el.gz
-share/emacs/${VERSION}/leim/quail/welsh.elc
 share/emacs/${VERSION}/lisp/
 share/emacs/${VERSION}/lisp/COPYING
 share/emacs/${VERSION}/lisp/README
@@ -1205,8 +1085,6 @@ share/emacs/${VERSION}/lisp/buff-menu.el
 share/emacs/${VERSION}/lisp/button.el.gz
 share/emacs/${VERSION}/lisp/button.elc
 share/emacs/${VERSION}/lisp/calc/
-share/emacs/${VERSION}/lisp/calc/README
-share/emacs/${VERSION}/lisp/calc/README.prev
 share/emacs/${VERSION}/lisp/calc/calc-aent.el.gz
 share/emacs/${VERSION}/lisp/calc/calc-aent.elc
 share/emacs/${VERSION}/lisp/calc/calc-alg.el.gz
@@ -1739,6 +1617,8 @@ share/emacs/${VERSION}/lisp/edmacro.el.g
 share/emacs/${VERSION}/lisp/edmacro.elc
 share/emacs/${VERSION}/lisp/ehelp.el.gz
 share/emacs/${VERSION}/lisp/ehelp.elc
+share/emacs/${VERSION}/lisp/elec-pair.el.gz
+share/emacs/${VERSION}/lisp/elec-pair.elc
 share/emacs/${VERSION}/lisp/electric.el.gz
 share/emacs/${VERSION}/lisp/electric.elc
 share/emacs/${VERSION}/lisp/elide-head.el.gz
@@ -1803,6 +1683,8 @@ share/emacs/${VERSION}/lisp/emacs-lisp/e
 share/emacs/${VERSION}/lisp/emacs-lisp/edebug.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/eieio-base.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/eieio-base.elc
+share/emacs/${VERSION}/lisp/emacs-lisp/eieio-core.el.gz
+share/emacs/${VERSION}/lisp/emacs-lisp/eieio-core.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/eieio-custom.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/eieio-custom.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/eieio-datadebug.el.gz
@@ -1827,8 +1709,6 @@ share/emacs/${VERSION}/lisp/emacs-lisp/e
 share/emacs/${VERSION}/lisp/emacs-lisp/ewoc.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/find-func.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/find-func.elc
-share/emacs/${VERSION}/lisp/emacs-lisp/find-gc.el.gz
-share/emacs/${VERSION}/lisp/emacs-lisp/find-gc.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/float-sup.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/float-sup.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/generic.el.gz
@@ -1849,6 +1729,8 @@ share/emacs/${VERSION}/lisp/emacs-lisp/m
 share/emacs/${VERSION}/lisp/emacs-lisp/macroexp.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/map-ynp.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/map-ynp.elc
+share/emacs/${VERSION}/lisp/emacs-lisp/nadvice.el.gz
+share/emacs/${VERSION}/lisp/emacs-lisp/nadvice.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/package-x.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/package-x.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/package.el.gz
@@ -1871,6 +1753,8 @@ share/emacs/${VERSION}/lisp/emacs-lisp/s
 share/emacs/${VERSION}/lisp/emacs-lisp/shadow.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/smie.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/smie.elc
+share/emacs/${VERSION}/lisp/emacs-lisp/subr-x.el.gz
+share/emacs/${VERSION}/lisp/emacs-lisp/subr-x.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/syntax.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/syntax.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/tabulated-list.el.gz
@@ -2058,6 +1942,8 @@ share/emacs/${VERSION}/lisp/eshell/em-sm
 share/emacs/${VERSION}/lisp/eshell/em-smart.elc
 share/emacs/${VERSION}/lisp/eshell/em-term.el.gz
 share/emacs/${VERSION}/lisp/eshell/em-term.elc
+share/emacs/${VERSION}/lisp/eshell/em-tramp.el.gz
+share/emacs/${VERSION}/lisp/eshell/em-tramp.elc
 share/emacs/${VERSION}/lisp/eshell/em-unix.el.gz
 share/emacs/${VERSION}/lisp/eshell/em-unix.elc
 share/emacs/${VERSION}/lisp/eshell/em-xtra.el.gz
@@ -2099,6 +1985,8 @@ share/emacs/${VERSION}/lisp/ffap.el.gz
 share/emacs/${VERSION}/lisp/ffap.elc
 share/emacs/${VERSION}/lisp/filecache.el.gz
 share/emacs/${VERSION}/lisp/filecache.elc
+share/emacs/${VERSION}/lisp/filenotify.el.gz
+share/emacs/${VERSION}/lisp/filenotify.elc
 share/emacs/${VERSION}/lisp/files-x.el.gz
 share/emacs/${VERSION}/lisp/files-x.elc
 share/emacs/${VERSION}/lisp/files.el.gz
@@ -2134,6 +2022,8 @@ share/emacs/${VERSION}/lisp/forms.el.gz
 share/emacs/${VERSION}/lisp/forms.elc
 share/emacs/${VERSION}/lisp/frame.el.gz
 share/emacs/${VERSION}/lisp/frame.elc
+share/emacs/${VERSION}/lisp/frameset.el.gz
+share/emacs/${VERSION}/lisp/frameset.elc
 share/emacs/${VERSION}/lisp/fringe.el.gz
 share/emacs/${VERSION}/lisp/fringe.elc
 share/emacs/${VERSION}/lisp/generic-x.el.gz
@@ -2194,6 +2084,8 @@ share/emacs/${VERSION}/lisp/gnus/gnus-gr
 share/emacs/${VERSION}/lisp/gnus/gnus-group.elc
 share/emacs/${VERSION}/lisp/gnus/gnus-html.el.gz
 share/emacs/${VERSION}/lisp/gnus/gnus-html.elc
+share/emacs/${VERSION}/lisp/gnus/gnus-icalendar.el.gz
+share/emacs/${VERSION}/lisp/gnus/gnus-icalendar.elc
 share/emacs/${VERSION}/lisp/gnus/gnus-int.el.gz
 share/emacs/${VERSION}/lisp/gnus/gnus-int.elc
 share/emacs/${VERSION}/lisp/gnus/gnus-kill.el.gz
@@ -2374,10 +2266,6 @@ share/emacs/${VERSION}/lisp/gnus/rtree.e
 share/emacs/${VERSION}/lisp/gnus/rtree.elc
 share/emacs/${VERSION}/lisp/gnus/score-mode.el.gz
 share/emacs/${VERSION}/lisp/gnus/score-mode.elc
-share/emacs/${VERSION}/lisp/gnus/shr-color.el.gz
-share/emacs/${VERSION}/lisp/gnus/shr-color.elc
-share/emacs/${VERSION}/lisp/gnus/shr.el.gz
-share/emacs/${VERSION}/lisp/gnus/shr.elc
 share/emacs/${VERSION}/lisp/gnus/sieve-manage.el.gz
 share/emacs/${VERSION}/lisp/gnus/sieve-manage.elc
 share/emacs/${VERSION}/lisp/gnus/sieve-mode.el.gz
@@ -2535,8 +2423,6 @@ share/emacs/${VERSION}/lisp/isearch.el.g
 share/emacs/${VERSION}/lisp/isearch.elc
 share/emacs/${VERSION}/lisp/isearchb.el.gz
 share/emacs/${VERSION}/lisp/isearchb.elc
-share/emacs/${VERSION}/lisp/iswitchb.el.gz
-share/emacs/${VERSION}/lisp/iswitchb.elc
 share/emacs/${VERSION}/lisp/jit-lock.el.gz
 share/emacs/${VERSION}/lisp/jit-lock.elc
 share/emacs/${VERSION}/lisp/jka-cmpr-hook.el.gz
@@ -2627,6 +2513,130 @@ share/emacs/${VERSION}/lisp/language/vie
 share/emacs/${VERSION}/lisp/language/vietnamese.el.gz
 share/emacs/${VERSION}/lisp/language/vietnamese.elc
 share/emacs/${VERSION}/lisp/ldefs-boot.el
+share/emacs/${VERSION}/lisp/leim/
+share/emacs/${VERSION}/lisp/leim/ja-dic/
+share/emacs/${VERSION}/lisp/leim/ja-dic/ja-dic.el.gz
+share/emacs/${VERSION}/lisp/leim/ja-dic/ja-dic.elc
+share/emacs/${VERSION}/lisp/leim/leim-list.el
+share/emacs/${VERSION}/lisp/leim/quail/
+share/emacs/${VERSION}/lisp/leim/quail/4Corner.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/4Corner.elc
+share/emacs/${VERSION}/lisp/leim/quail/ARRAY30.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/ARRAY30.elc
+share/emacs/${VERSION}/lisp/leim/quail/CCDOSPY.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/CCDOSPY.elc
+share/emacs/${VERSION}/lisp/leim/quail/CTLau-b5.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/CTLau-b5.elc
+share/emacs/${VERSION}/lisp/leim/quail/CTLau.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/CTLau.elc
+share/emacs/${VERSION}/lisp/leim/quail/ECDICT.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/ECDICT.elc
+share/emacs/${VERSION}/lisp/leim/quail/ETZY.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/ETZY.elc
+share/emacs/${VERSION}/lisp/leim/quail/PY-b5.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/PY-b5.elc
+share/emacs/${VERSION}/lisp/leim/quail/PY.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/PY.elc
+share/emacs/${VERSION}/lisp/leim/quail/Punct-b5.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/Punct-b5.elc
+share/emacs/${VERSION}/lisp/leim/quail/Punct.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/Punct.elc
+share/emacs/${VERSION}/lisp/leim/quail/QJ-b5.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/QJ-b5.elc
+share/emacs/${VERSION}/lisp/leim/quail/QJ.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/QJ.elc
+share/emacs/${VERSION}/lisp/leim/quail/SW.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/SW.elc
+share/emacs/${VERSION}/lisp/leim/quail/TONEPY.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/TONEPY.elc
+share/emacs/${VERSION}/lisp/leim/quail/ZIRANMA.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/ZIRANMA.elc
+share/emacs/${VERSION}/lisp/leim/quail/ZOZY.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/ZOZY.elc
+share/emacs/${VERSION}/lisp/leim/quail/arabic.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/arabic.elc
+share/emacs/${VERSION}/lisp/leim/quail/croatian.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/croatian.elc
+share/emacs/${VERSION}/lisp/leim/quail/cyril-jis.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/cyril-jis.elc
+share/emacs/${VERSION}/lisp/leim/quail/cyrillic.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/cyrillic.elc
+share/emacs/${VERSION}/lisp/leim/quail/czech.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/czech.elc
+share/emacs/${VERSION}/lisp/leim/quail/ethiopic.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/ethiopic.elc
+share/emacs/${VERSION}/lisp/leim/quail/georgian.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/georgian.elc
+share/emacs/${VERSION}/lisp/leim/quail/greek.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/greek.elc
+share/emacs/${VERSION}/lisp/leim/quail/hangul.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/hangul.elc
+share/emacs/${VERSION}/lisp/leim/quail/hanja-jis.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/hanja-jis.elc
+share/emacs/${VERSION}/lisp/leim/quail/hanja.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/hanja.elc
+share/emacs/${VERSION}/lisp/leim/quail/hanja3.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/hanja3.elc
+share/emacs/${VERSION}/lisp/leim/quail/hebrew.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/hebrew.elc
+share/emacs/${VERSION}/lisp/leim/quail/indian.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/indian.elc
+share/emacs/${VERSION}/lisp/leim/quail/ipa-praat.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/ipa-praat.elc
+share/emacs/${VERSION}/lisp/leim/quail/ipa.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/ipa.elc
+share/emacs/${VERSION}/lisp/leim/quail/japanese.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/japanese.elc
+share/emacs/${VERSION}/lisp/leim/quail/lao.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/lao.elc
+share/emacs/${VERSION}/lisp/leim/quail/latin-alt.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/latin-alt.elc
+share/emacs/${VERSION}/lisp/leim/quail/latin-ltx.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/latin-ltx.elc
+share/emacs/${VERSION}/lisp/leim/quail/latin-post.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/latin-post.elc
+share/emacs/${VERSION}/lisp/leim/quail/latin-pre.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/latin-pre.elc
+share/emacs/${VERSION}/lisp/leim/quail/lrt.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/lrt.elc
+share/emacs/${VERSION}/lisp/leim/quail/persian.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/persian.elc
+share/emacs/${VERSION}/lisp/leim/quail/py-punct.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/py-punct.elc
+share/emacs/${VERSION}/lisp/leim/quail/pypunct-b5.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/pypunct-b5.elc
+share/emacs/${VERSION}/lisp/leim/quail/quick-b5.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/quick-b5.elc
+share/emacs/${VERSION}/lisp/leim/quail/quick-cns.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/quick-cns.elc
+share/emacs/${VERSION}/lisp/leim/quail/rfc1345.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/rfc1345.elc
+share/emacs/${VERSION}/lisp/leim/quail/sgml-input.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/sgml-input.elc
+share/emacs/${VERSION}/lisp/leim/quail/sisheng.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/sisheng.elc
+share/emacs/${VERSION}/lisp/leim/quail/slovak.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/slovak.elc
+share/emacs/${VERSION}/lisp/leim/quail/symbol-ksc.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/symbol-ksc.elc
+share/emacs/${VERSION}/lisp/leim/quail/thai.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/thai.elc
+share/emacs/${VERSION}/lisp/leim/quail/tibetan.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/tibetan.elc
+share/emacs/${VERSION}/lisp/leim/quail/tsang-b5.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/tsang-b5.elc
+share/emacs/${VERSION}/lisp/leim/quail/tsang-cns.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/tsang-cns.elc
+share/emacs/${VERSION}/lisp/leim/quail/uni-input.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/uni-input.elc
+share/emacs/${VERSION}/lisp/leim/quail/viqr.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/viqr.elc
+share/emacs/${VERSION}/lisp/leim/quail/vntelex.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/vntelex.elc
+share/emacs/${VERSION}/lisp/leim/quail/vnvni.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/vnvni.elc
+share/emacs/${VERSION}/lisp/leim/quail/welsh.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/welsh.elc
 share/emacs/${VERSION}/lisp/linum.el.gz
 share/emacs/${VERSION}/lisp/linum.elc
 share/emacs/${VERSION}/lisp/loaddefs.el
@@ -2635,8 +2645,6 @@ share/emacs/${VERSION}/lisp/loadhist.elc
 share/emacs/${VERSION}/lisp/loadup.el
 share/emacs/${VERSION}/lisp/locate.el.gz
 share/emacs/${VERSION}/lisp/locate.elc
-share/emacs/${VERSION}/lisp/longlines.el.gz
-share/emacs/${VERSION}/lisp/longlines.elc
 share/emacs/${VERSION}/lisp/lpr.el.gz
 share/emacs/${VERSION}/lisp/lpr.elc
 share/emacs/${VERSION}/lisp/ls-lisp.el.gz
@@ -2823,6 +2831,8 @@ share/emacs/${VERSION}/lisp/net/eudcb-ma
 share/emacs/${VERSION}/lisp/net/eudcb-mab.elc
 share/emacs/${VERSION}/lisp/net/eudcb-ph.el.gz
 share/emacs/${VERSION}/lisp/net/eudcb-ph.elc
+share/emacs/${VERSION}/lisp/net/eww.el.gz
+share/emacs/${VERSION}/lisp/net/eww.elc
 share/emacs/${VERSION}/lisp/net/gnutls.el.gz
 share/emacs/${VERSION}/lisp/net/gnutls.elc
 share/emacs/${VERSION}/lisp/net/goto-addr.el.gz
@@ -2861,8 +2871,6 @@ share/emacs/${VERSION}/lisp/net/quickurl
 share/emacs/${VERSION}/lisp/net/quickurl.elc
 share/emacs/${VERSION}/lisp/net/rcirc.el.gz
 share/emacs/${VERSION}/lisp/net/rcirc.elc
-share/emacs/${VERSION}/lisp/net/rcompile.el.gz
-share/emacs/${VERSION}/lisp/net/rcompile.elc
 share/emacs/${VERSION}/lisp/net/rlogin.el.gz
 share/emacs/${VERSION}/lisp/net/rlogin.elc
 share/emacs/${VERSION}/lisp/net/sasl-cram.el.gz
@@ -2875,6 +2883,10 @@ share/emacs/${VERSION}/lisp/net/sasl.el.
 share/emacs/${VERSION}/lisp/net/sasl.elc
 share/emacs/${VERSION}/lisp/net/secrets.el.gz
 share/emacs/${VERSION}/lisp/net/secrets.elc
+share/emacs/${VERSION}/lisp/net/shr-color.el.gz
+share/emacs/${VERSION}/lisp/net/shr-color.elc
+share/emacs/${VERSION}/lisp/net/shr.el.gz
+share/emacs/${VERSION}/lisp/net/shr.elc
 share/emacs/${VERSION}/lisp/net/snmp-mode.el.gz
 share/emacs/${VERSION}/lisp/net/snmp-mode.elc
 share/emacs/${VERSION}/lisp/net/soap-client.el.gz
@@ -2887,6 +2899,8 @@ share/emacs/${VERSION}/lisp/net/telnet.e
 share/emacs/${VERSION}/lisp/net/telnet.elc
 share/emacs/${VERSION}/lisp/net/tls.el.gz
 share/emacs/${VERSION}/lisp/net/tls.elc
+share/emacs/${VERSION}/lisp/net/tramp-adb.el.gz
+share/emacs/${VERSION}/lisp/net/tramp-adb.elc
 share/emacs/${VERSION}/lisp/net/tramp-cache.el.gz
 share/emacs/${VERSION}/lisp/net/tramp-cache.elc
 share/emacs/${VERSION}/lisp/net/tramp-cmds.el.gz
@@ -2912,8 +2926,6 @@ share/emacs/${VERSION}/lisp/net/trampver
 share/emacs/${VERSION}/lisp/net/trampver.elc
 share/emacs/${VERSION}/lisp/net/webjump.el.gz
 share/emacs/${VERSION}/lisp/net/webjump.elc
-share/emacs/${VERSION}/lisp/net/xesam.el.gz
-share/emacs/${VERSION}/lisp/net/xesam.elc
 share/emacs/${VERSION}/lisp/net/zeroconf.el.gz
 share/emacs/${VERSION}/lisp/net/zeroconf.elc
 share/emacs/${VERSION}/lisp/newcomment.el.gz
@@ -2995,6 +3007,8 @@ share/emacs/${VERSION}/lisp/obsolete/iso
 share/emacs/${VERSION}/lisp/obsolete/iso-insert.elc
 share/emacs/${VERSION}/lisp/obsolete/iso-swed.el.gz
 share/emacs/${VERSION}/lisp/obsolete/iso-swed.elc
+share/emacs/${VERSION}/lisp/obsolete/iswitchb.el.gz
+share/emacs/${VERSION}/lisp/obsolete/iswitchb.elc
 share/emacs/${VERSION}/lisp/obsolete/keyswap.el
 share/emacs/${VERSION}/lisp/obsolete/lazy-lock.el.gz
 share/emacs/${VERSION}/lisp/obsolete/lazy-lock.elc
@@ -3004,10 +3018,14 @@ share/emacs/${VERSION}/lisp/obsolete/lev
 share/emacs/${VERSION}/lisp/obsolete/levents.elc
 share/emacs/${VERSION}/lisp/obsolete/lmenu.el.gz
 share/emacs/${VERSION}/lisp/obsolete/lmenu.elc
+share/emacs/${VERSION}/lisp/obsolete/longlines.el.gz
+share/emacs/${VERSION}/lisp/obsolete/longlines.elc
 share/emacs/${VERSION}/lisp/obsolete/lucid.el.gz
 share/emacs/${VERSION}/lisp/obsolete/lucid.elc
 share/emacs/${VERSION}/lisp/obsolete/mailpost.el.gz
 share/emacs/${VERSION}/lisp/obsolete/mailpost.elc
+share/emacs/${VERSION}/lisp/obsolete/meese.el.gz
+share/emacs/${VERSION}/lisp/obsolete/meese.elc
 share/emacs/${VERSION}/lisp/obsolete/mouse-sel.el.gz
 share/emacs/${VERSION}/lisp/obsolete/mouse-sel.elc
 share/emacs/${VERSION}/lisp/obsolete/old-emacs-lock.el.gz
@@ -3016,6 +3034,8 @@ share/emacs/${VERSION}/lisp/obsolete/old
 share/emacs/${VERSION}/lisp/obsolete/old-whitespace.elc
 share/emacs/${VERSION}/lisp/obsolete/options.el.gz
 share/emacs/${VERSION}/lisp/obsolete/options.elc
+share/emacs/${VERSION}/lisp/obsolete/otodo-mode.el.gz
+share/emacs/${VERSION}/lisp/obsolete/otodo-mode.elc
 share/emacs/${VERSION}/lisp/obsolete/patcomp.el
 share/emacs/${VERSION}/lisp/obsolete/pc-mode.el.gz
 share/emacs/${VERSION}/lisp/obsolete/pc-mode.elc
@@ -3033,6 +3053,8 @@ share/emacs/${VERSION}/lisp/obsolete/pgg
 share/emacs/${VERSION}/lisp/obsolete/pgg-pgp5.elc
 share/emacs/${VERSION}/lisp/obsolete/pgg.el.gz
 share/emacs/${VERSION}/lisp/obsolete/pgg.elc
+share/emacs/${VERSION}/lisp/obsolete/rcompile.el.gz
+share/emacs/${VERSION}/lisp/obsolete/rcompile.elc
 share/emacs/${VERSION}/lisp/obsolete/resume.el.gz
 share/emacs/${VERSION}/lisp/obsolete/resume.elc
 share/emacs/${VERSION}/lisp/obsolete/s-region.el.gz
@@ -3043,12 +3065,20 @@ share/emacs/${VERSION}/lisp/obsolete/spe
 share/emacs/${VERSION}/lisp/obsolete/spell.elc
 share/emacs/${VERSION}/lisp/obsolete/sregex.el.gz
 share/emacs/${VERSION}/lisp/obsolete/sregex.elc
+share/emacs/${VERSION}/lisp/obsolete/sup-mouse.el.gz
+share/emacs/${VERSION}/lisp/obsolete/sup-mouse.elc
 share/emacs/${VERSION}/lisp/obsolete/swedish.el.gz
 share/emacs/${VERSION}/lisp/obsolete/swedish.elc
 share/emacs/${VERSION}/lisp/obsolete/sym-comp.el.gz
 share/emacs/${VERSION}/lisp/obsolete/sym-comp.elc
+share/emacs/${VERSION}/lisp/obsolete/terminal.el.gz
+share/emacs/${VERSION}/lisp/obsolete/terminal.elc
 share/emacs/${VERSION}/lisp/obsolete/vc-mcvs.el.gz
 share/emacs/${VERSION}/lisp/obsolete/vc-mcvs.elc
+share/emacs/${VERSION}/lisp/obsolete/xesam.el.gz
+share/emacs/${VERSION}/lisp/obsolete/xesam.elc
+share/emacs/${VERSION}/lisp/obsolete/yow.el.gz
+share/emacs/${VERSION}/lisp/obsolete/yow.elc
 share/emacs/${VERSION}/lisp/org/
 share/emacs/${VERSION}/lisp/org/ob-C.el.gz
 share/emacs/${VERSION}/lisp/org/ob-C.elc
@@ -3064,6 +3094,8 @@ share/emacs/${VERSION}/lisp/org/ob-cloju
 share/emacs/${VERSION}/lisp/org/ob-clojure.elc
 share/emacs/${VERSION}/lisp/org/ob-comint.el.gz
 share/emacs/${VERSION}/lisp/org/ob-comint.elc
+share/emacs/${VERSION}/lisp/org/ob-core.el.gz
+share/emacs/${VERSION}/lisp/org/ob-core.elc
 share/emacs/${VERSION}/lisp/org/ob-css.el.gz
 share/emacs/${VERSION}/lisp/org/ob-css.elc
 share/emacs/${VERSION}/lisp/org/ob-ditaa.el.gz
@@ -3100,6 +3132,8 @@ share/emacs/${VERSION}/lisp/org/ob-lisp.
 share/emacs/${VERSION}/lisp/org/ob-lisp.elc
 share/emacs/${VERSION}/lisp/org/ob-lob.el.gz
 share/emacs/${VERSION}/lisp/org/ob-lob.elc
+share/emacs/${VERSION}/lisp/org/ob-makefile.el.gz
+share/emacs/${VERSION}/lisp/org/ob-makefile.elc
 share/emacs/${VERSION}/lisp/org/ob-matlab.el.gz
 share/emacs/${VERSION}/lisp/org/ob-matlab.elc
 share/emacs/${VERSION}/lisp/org/ob-maxima.el.gz
@@ -3150,14 +3184,10 @@ share/emacs/${VERSION}/lisp/org/org-agen
 share/emacs/${VERSION}/lisp/org/org-agenda.elc
 share/emacs/${VERSION}/lisp/org/org-archive.el.gz
 share/emacs/${VERSION}/lisp/org/org-archive.elc
-share/emacs/${VERSION}/lisp/org/org-ascii.el.gz
-share/emacs/${VERSION}/lisp/org/org-ascii.elc
 share/emacs/${VERSION}/lisp/org/org-attach.el.gz
 share/emacs/${VERSION}/lisp/org/org-attach.elc
 share/emacs/${VERSION}/lisp/org/org-bbdb.el.gz
 share/emacs/${VERSION}/lisp/org/org-bbdb.elc
-share/emacs/${VERSION}/lisp/org/org-beamer.el.gz
-share/emacs/${VERSION}/lisp/org/org-beamer.elc
 share/emacs/${VERSION}/lisp/org/org-bibtex.el.gz
 share/emacs/${VERSION}/lisp/org/org-bibtex.elc
 share/emacs/${VERSION}/lisp/org/org-capture.el.gz
@@ -3174,8 +3204,6 @@ share/emacs/${VERSION}/lisp/org/org-ctag
 share/emacs/${VERSION}/lisp/org/org-ctags.elc
 share/emacs/${VERSION}/lisp/org/org-datetree.el.gz
 share/emacs/${VERSION}/lisp/org/org-datetree.elc
-share/emacs/${VERSION}/lisp/org/org-docbook.el.gz
-share/emacs/${VERSION}/lisp/org/org-docbook.elc
 share/emacs/${VERSION}/lisp/org/org-docview.el.gz
 share/emacs/${VERSION}/lisp/org/org-docview.elc
 share/emacs/${VERSION}/lisp/org/org-element.el.gz
@@ -3184,26 +3212,16 @@ share/emacs/${VERSION}/lisp/org/org-enti
 share/emacs/${VERSION}/lisp/org/org-entities.elc
 share/emacs/${VERSION}/lisp/org/org-eshell.el.gz
 share/emacs/${VERSION}/lisp/org/org-eshell.elc
-share/emacs/${VERSION}/lisp/org/org-exp-blocks.el.gz
-share/emacs/${VERSION}/lisp/org/org-exp-blocks.elc
-share/emacs/${VERSION}/lisp/org/org-exp.el.gz
-share/emacs/${VERSION}/lisp/org/org-exp.elc
 share/emacs/${VERSION}/lisp/org/org-faces.el.gz
 share/emacs/${VERSION}/lisp/org/org-faces.elc
 share/emacs/${VERSION}/lisp/org/org-feed.el.gz
 share/emacs/${VERSION}/lisp/org/org-feed.elc
 share/emacs/${VERSION}/lisp/org/org-footnote.el.gz
 share/emacs/${VERSION}/lisp/org/org-footnote.elc
-share/emacs/${VERSION}/lisp/org/org-freemind.el.gz
-share/emacs/${VERSION}/lisp/org/org-freemind.elc
 share/emacs/${VERSION}/lisp/org/org-gnus.el.gz
 share/emacs/${VERSION}/lisp/org/org-gnus.elc
 share/emacs/${VERSION}/lisp/org/org-habit.el.gz
 share/emacs/${VERSION}/lisp/org/org-habit.elc
-share/emacs/${VERSION}/lisp/org/org-html.el.gz
-share/emacs/${VERSION}/lisp/org/org-html.elc
-share/emacs/${VERSION}/lisp/org/org-icalendar.el.gz
-share/emacs/${VERSION}/lisp/org/org-icalendar.elc
 share/emacs/${VERSION}/lisp/org/org-id.el.gz
 share/emacs/${VERSION}/lisp/org/org-id.elc
 share/emacs/${VERSION}/lisp/org/org-indent.el.gz
@@ -3215,64 +3233,62 @@ share/emacs/${VERSION}/lisp/org/org-inli
 share/emacs/${VERSION}/lisp/org/org-install.el
 share/emacs/${VERSION}/lisp/org/org-irc.el.gz
 share/emacs/${VERSION}/lisp/org/org-irc.elc
-share/emacs/${VERSION}/lisp/org/org-jsinfo.el.gz
-share/emacs/${VERSION}/lisp/org/org-jsinfo.elc
-share/emacs/${VERSION}/lisp/org/org-latex.el.gz
-share/emacs/${VERSION}/lisp/org/org-latex.elc
 share/emacs/${VERSION}/lisp/org/org-list.el.gz
 share/emacs/${VERSION}/lisp/org/org-list.elc
 share/emacs/${VERSION}/lisp/org/org-loaddefs.el
-share/emacs/${VERSION}/lisp/org/org-lparse.el.gz
-share/emacs/${VERSION}/lisp/org/org-lparse.elc
-share/emacs/${VERSION}/lisp/org/org-mac-message.el.gz
-share/emacs/${VERSION}/lisp/org/org-mac-message.elc
+share/emacs/${VERSION}/lisp/org/org-macro.el.gz
+share/emacs/${VERSION}/lisp/org/org-macro.elc
 share/emacs/${VERSION}/lisp/org/org-macs.el.gz
 share/emacs/${VERSION}/lisp/org/org-macs.elc
-share/emacs/${VERSION}/lisp/org/org-mew.el.gz
-share/emacs/${VERSION}/lisp/org/org-mew.elc
 share/emacs/${VERSION}/lisp/org/org-mhe.el.gz
 share/emacs/${VERSION}/lisp/org/org-mhe.elc
-share/emacs/${VERSION}/lisp/org/org-mks.el.gz
-share/emacs/${VERSION}/lisp/org/org-mks.elc
 share/emacs/${VERSION}/lisp/org/org-mobile.el.gz
 share/emacs/${VERSION}/lisp/org/org-mobile.elc
 share/emacs/${VERSION}/lisp/org/org-mouse.el.gz
 share/emacs/${VERSION}/lisp/org/org-mouse.elc
-share/emacs/${VERSION}/lisp/org/org-odt.el.gz
-share/emacs/${VERSION}/lisp/org/org-odt.elc
 share/emacs/${VERSION}/lisp/org/org-pcomplete.el.gz
 share/emacs/${VERSION}/lisp/org/org-pcomplete.elc
 share/emacs/${VERSION}/lisp/org/org-plot.el.gz
 share/emacs/${VERSION}/lisp/org/org-plot.elc
 share/emacs/${VERSION}/lisp/org/org-protocol.el.gz
 share/emacs/${VERSION}/lisp/org/org-protocol.elc
-share/emacs/${VERSION}/lisp/org/org-publish.el.gz
-share/emacs/${VERSION}/lisp/org/org-publish.elc
-share/emacs/${VERSION}/lisp/org/org-remember.el.gz
-share/emacs/${VERSION}/lisp/org/org-remember.elc
 share/emacs/${VERSION}/lisp/org/org-rmail.el.gz
 share/emacs/${VERSION}/lisp/org/org-rmail.elc
-share/emacs/${VERSION}/lisp/org/org-special-blocks.el.gz
-share/emacs/${VERSION}/lisp/org/org-special-blocks.elc
 share/emacs/${VERSION}/lisp/org/org-src.el.gz
 share/emacs/${VERSION}/lisp/org/org-src.elc
 share/emacs/${VERSION}/lisp/org/org-table.el.gz
 share/emacs/${VERSION}/lisp/org/org-table.elc
-share/emacs/${VERSION}/lisp/org/org-taskjuggler.el.gz
-share/emacs/${VERSION}/lisp/org/org-taskjuggler.elc
 share/emacs/${VERSION}/lisp/org/org-timer.el.gz
 share/emacs/${VERSION}/lisp/org/org-timer.elc
 share/emacs/${VERSION}/lisp/org/org-version.el
-share/emacs/${VERSION}/lisp/org/org-vm.el.gz
-share/emacs/${VERSION}/lisp/org/org-vm.elc
 share/emacs/${VERSION}/lisp/org/org-w3m.el.gz
 share/emacs/${VERSION}/lisp/org/org-w3m.elc
-share/emacs/${VERSION}/lisp/org/org-wl.el.gz
-share/emacs/${VERSION}/lisp/org/org-wl.elc
-share/emacs/${VERSION}/lisp/org/org-xoxo.el.gz
-share/emacs/${VERSION}/lisp/org/org-xoxo.elc
 share/emacs/${VERSION}/lisp/org/org.el.gz
 share/emacs/${VERSION}/lisp/org/org.elc
+share/emacs/${VERSION}/lisp/org/ox-ascii.el.gz
+share/emacs/${VERSION}/lisp/org/ox-ascii.elc
+share/emacs/${VERSION}/lisp/org/ox-beamer.el.gz
+share/emacs/${VERSION}/lisp/org/ox-beamer.elc
+share/emacs/${VERSION}/lisp/org/ox-html.el.gz
+share/emacs/${VERSION}/lisp/org/ox-html.elc
+share/emacs/${VERSION}/lisp/org/ox-icalendar.el.gz
+share/emacs/${VERSION}/lisp/org/ox-icalendar.elc
+share/emacs/${VERSION}/lisp/org/ox-latex.el.gz
+share/emacs/${VERSION}/lisp/org/ox-latex.elc
+share/emacs/${VERSION}/lisp/org/ox-man.el.gz
+share/emacs/${VERSION}/lisp/org/ox-man.elc
+share/emacs/${VERSION}/lisp/org/ox-md.el.gz
+share/emacs/${VERSION}/lisp/org/ox-md.elc
+share/emacs/${VERSION}/lisp/org/ox-odt.el.gz
+share/emacs/${VERSION}/lisp/org/ox-odt.elc
+share/emacs/${VERSION}/lisp/org/ox-org.el.gz
+share/emacs/${VERSION}/lisp/org/ox-org.elc
+share/emacs/${VERSION}/lisp/org/ox-publish.el.gz
+share/emacs/${VERSION}/lisp/org/ox-publish.elc
+share/emacs/${VERSION}/lisp/org/ox-texinfo.el.gz
+share/emacs/${VERSION}/lisp/org/ox-texinfo.elc
+share/emacs/${VERSION}/lisp/org/ox.el.gz
+share/emacs/${VERSION}/lisp/org/ox.elc
 share/emacs/${VERSION}/lisp/outline.el.gz
 share/emacs/${VERSION}/lisp/outline.elc
 share/emacs/${VERSION}/lisp/paren.el.gz
@@ -3289,6 +3305,8 @@ share/emacs/${VERSION}/lisp/pcmpl-rpm.el
 share/emacs/${VERSION}/lisp/pcmpl-rpm.elc
 share/emacs/${VERSION}/lisp/pcmpl-unix.el.gz
 share/emacs/${VERSION}/lisp/pcmpl-unix.elc
+share/emacs/${VERSION}/lisp/pcmpl-x.el.gz
+share/emacs/${VERSION}/lisp/pcmpl-x.elc
 share/emacs/${VERSION}/lisp/pcomplete.el.gz
 share/emacs/${VERSION}/lisp/pcomplete.elc
 share/emacs/${VERSION}/lisp/play/
@@ -3326,8 +3344,6 @@ share/emacs/${VERSION}/lisp/play/landmar
 share/emacs/${VERSION}/lisp/play/landmark.elc
 share/emacs/${VERSION}/lisp/play/life.el.gz
 share/emacs/${VERSION}/lisp/play/life.elc
-share/emacs/${VERSION}/lisp/play/meese.el.gz
-share/emacs/${VERSION}/lisp/play/meese.elc
 share/emacs/${VERSION}/lisp/play/morse.el.gz
 share/emacs/${VERSION}/lisp/play/morse.elc
 share/emacs/${VERSION}/lisp/play/mpuz.el.gz
@@ -3344,8 +3360,6 @@ share/emacs/${VERSION}/lisp/play/studly.
 share/emacs/${VERSION}/lisp/play/studly.elc
 share/emacs/${VERSION}/lisp/play/tetris.el.gz
 share/emacs/${VERSION}/lisp/play/tetris.elc
-share/emacs/${VERSION}/lisp/play/yow.el.gz
-share/emacs/${VERSION}/lisp/play/yow.elc
 share/emacs/${VERSION}/lisp/play/zone.el.gz
 share/emacs/${VERSION}/lisp/play/zone.elc
 share/emacs/${VERSION}/lisp/printing.el.gz
@@ -3369,6 +3383,8 @@ share/emacs/${VERSION}/lisp/progmodes/as
 share/emacs/${VERSION}/lisp/progmodes/asm-mode.elc
 share/emacs/${VERSION}/lisp/progmodes/autoconf.el.gz
 share/emacs/${VERSION}/lisp/progmodes/autoconf.elc
+share/emacs/${VERSION}/lisp/progmodes/bat-mode.el.gz
+share/emacs/${VERSION}/lisp/progmodes/bat-mode.elc
 share/emacs/${VERSION}/lisp/progmodes/bug-reference.el.gz
 share/emacs/${VERSION}/lisp/progmodes/bug-reference.elc
 share/emacs/${VERSION}/lisp/progmodes/cap-words.el.gz
@@ -3415,8 +3431,6 @@ share/emacs/${VERSION}/lisp/progmodes/cw
 share/emacs/${VERSION}/lisp/progmodes/cwarn.elc
 share/emacs/${VERSION}/lisp/progmodes/dcl-mode.el.gz
 share/emacs/${VERSION}/lisp/progmodes/dcl-mode.elc
-share/emacs/${VERSION}/lisp/progmodes/delphi.el.gz
-share/emacs/${VERSION}/lisp/progmodes/delphi.elc
 share/emacs/${VERSION}/lisp/progmodes/ebnf-abn.el.gz
 share/emacs/${VERSION}/lisp/progmodes/ebnf-abn.elc
 share/emacs/${VERSION}/lisp/progmodes/ebnf-bnf.el.gz
@@ -3487,14 +3501,16 @@ share/emacs/${VERSION}/lisp/progmodes/mi
 share/emacs/${VERSION}/lisp/progmodes/mixal-mode.elc
 share/emacs/${VERSION}/lisp/progmodes/modula2.el.gz
 share/emacs/${VERSION}/lisp/progmodes/modula2.elc
-share/emacs/${VERSION}/lisp/progmodes/octave-inf.el.gz
-share/emacs/${VERSION}/lisp/progmodes/octave-inf.elc
-share/emacs/${VERSION}/lisp/progmodes/octave-mod.el.gz
-share/emacs/${VERSION}/lisp/progmodes/octave-mod.elc
+share/emacs/${VERSION}/lisp/progmodes/octave.el.gz
+share/emacs/${VERSION}/lisp/progmodes/octave.elc
+share/emacs/${VERSION}/lisp/progmodes/opascal.el.gz
+share/emacs/${VERSION}/lisp/progmodes/opascal.elc
 share/emacs/${VERSION}/lisp/progmodes/pascal.el.gz
 share/emacs/${VERSION}/lisp/progmodes/pascal.elc
 share/emacs/${VERSION}/lisp/progmodes/perl-mode.el.gz
 share/emacs/${VERSION}/lisp/progmodes/perl-mode.elc
+share/emacs/${VERSION}/lisp/progmodes/prog-mode.el.gz
+share/emacs/${VERSION}/lisp/progmodes/prog-mode.elc
 share/emacs/${VERSION}/lisp/progmodes/prolog.el.gz
 share/emacs/${VERSION}/lisp/progmodes/prolog.elc
 share/emacs/${VERSION}/lisp/progmodes/ps-mode.el.gz
@@ -3638,8 +3654,6 @@ share/emacs/${VERSION}/lisp/term/screen.
 share/emacs/${VERSION}/lisp/term/screen.elc
 share/emacs/${VERSION}/lisp/term/sun.el.gz
 share/emacs/${VERSION}/lisp/term/sun.elc
-share/emacs/${VERSION}/lisp/term/sup-mouse.el.gz
-share/emacs/${VERSION}/lisp/term/sup-mouse.elc
 share/emacs/${VERSION}/lisp/term/tty-colors.el.gz
 share/emacs/${VERSION}/lisp/term/tty-colors.elc
 share/emacs/${VERSION}/lisp/term/tvi970.el.gz
@@ -3676,8 +3690,6 @@ share/emacs/${VERSION}/lisp/term/x-win.e
 share/emacs/${VERSION}/lisp/term/x-win.elc
 share/emacs/${VERSION}/lisp/term/xterm.el.gz
 share/emacs/${VERSION}/lisp/term/xterm.elc
-share/emacs/${VERSION}/lisp/terminal.el.gz
-share/emacs/${VERSION}/lisp/terminal.elc
 share/emacs/${VERSION}/lisp/textmodes/
 share/emacs/${VERSION}/lisp/textmodes/artist.el.gz
 share/emacs/${VERSION}/lisp/textmodes/artist.elc


-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Reply via email to