Index: head/Mk/Uses/emacs.mk
===================================================================
--- head/Mk/Uses/emacs.mk
+++ head/Mk/Uses/emacs.mk
@@ -36,15 +36,15 @@
 #                             This will prevent flavors.
 #
 # Variables, which can be read by ports:
-# EMACS_CMD:                  Emacs command with full path (e.g. /usr/local/bin/emacs-25.3)
+# EMACS_CMD:                  Emacs command with full path (e.g. /usr/local/bin/emacs-26.1)
 # EMACS_FLAVOR:               Used for dependencies (e.g. BUILD_DEPENDS= dash.el${EMACS_PKGNAMESUFFIX}>0:devel/dash@${EMACS_FLAVOR})
 # EMACS_LIBDIR:               Emacs Library directory without ${PREFIX} (e.g. share/emacs)
-# EMACS_LIBDIR_WITH_VER:      Library directory without ${PREFIX} including version (e.g. share/emacs/25.3)
-# EMACS_MAJOR_VER:            Emacs major version (e.g. 25)
+# EMACS_LIBDIR_WITH_VER:      Library directory without ${PREFIX} including version (e.g. share/emacs/26.1)
+# EMACS_MAJOR_VER:            Emacs major version (e.g. 26)
 # EMACS_PKGNAMESUFFIX:        PKGNAMESUFFIX to distinguish Emacs flavors
 # EMACS_SITE_LISPDIR:         Emacs site-lisp directory without ${PREFIX} (e.g. share/emacs/site-lisp)
-# EMACS_VER:                  Emacs version (e.g. 25.3)
-# EMACS_VERSION_SITE_LISPDIR: Include version (e.g. share/emacs/25.3/site-lisp)
+# EMACS_VER:                  Emacs version (e.g. 26.1)
+# EMACS_VERSION_SITE_LISPDIR: Include version (e.g. share/emacs/26.1/site-lisp)
 #-------------------------------------------------------------------------------
 #
 # MAINTAINER:	emacs@FreeBSD.org
@@ -106,7 +106,7 @@
 EMACS_VER=			27.0.50
 EMACS_PORTDIR=		editors/emacs-devel
 .else
-EMACS_VER=			25.3
+EMACS_VER=			26.1
 EMACS_PORTDIR=		editors/emacs
 .endif
 
Index: head/editors/emacs/Makefile
===================================================================
--- head/editors/emacs/Makefile
+++ head/editors/emacs/Makefile
@@ -2,21 +2,28 @@
 # $FreeBSD$
 
 PORTNAME=	emacs
-PORTVERSION=	${EMACS_VER}
-PORTREVISION=	4
+DISTVERSION=	${EMACS_VER}
 PORTEPOCH=	3
 CATEGORIES=	editors ipv6
 MASTER_SITES=	GNU
 
+.if ${FLAVOR:U} == canna
+PATCH_DIST_STRIP=	-p1
+PATCH_SITES=	http://www.gentei.org/~yuuji/software/emacs26canna/
+PATCHFILES=	emacs26.1-canna-20180529.diff.gz
+.endif
+
 MAINTAINER=	emacs@FreeBSD.org
 COMMENT=	GNU editing macros
+.if ${FLAVOR:U} == nox
+COMMENT+=	(No X flavor)
+.elif ${FLAVOR:U} == canna
+COMMENT+=	(Canna Japanese input flavor)
+.endif
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_aarch64=	Fails to link: missing sbrk
-CONFLICTS_INSTALL=	emacs-devel emacs-devel_nox
-
 FLAVORS=		full canna nox
 full_CONFLICTS_INSTALL=	emacs-canna emacs-nox
 canna_CONFLICTS_INSTALL=	emacs emacs-nox
@@ -27,13 +34,34 @@
 nox_PKGNAMESUFFIX=	-nox
 
 USES=		cpe gmake localbase:ldflags makeinfo ncurses pkgconfig tar:xz
+.if ${FLAVOR:U} != nox
+USES+=		desktop-file-utils
+USE_XORG=	ice sm x11 xcb xext xfixes xinerama xmu xrandr xt
+.endif
 CPE_VENDOR=	gnu
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--localstatedir=/var \
+CONFIGURE_ARGS=	--disable-build-details \
+		--localstatedir=/var \
 		--with-gameuser=games:games
-CONFIGURE_ENV=	ac_cv_header_sys_sysinfo_h=no \
-		ac_cv_prog_liblockfile=no
+.if ${FLAVOR:U} == canna
+CONFIGURE_ARGS+=	--with-canna
+.endif
+.if ${FLAVOR:U} == nox
+CONFIGURE_ARGS+=	--with-sound=no --without-cairo --without-dbus \
+			--without-gconf --without-gif --without-gsettings \
+			--with-x-toolkit=no --without-jpeg --without-lcms2 \
+			--without-m17n-flt --without-imagemagick \
+			--without-libotf --without-png \
+			--without-toolkit-scroll-bars --without-rsvg \
+			--without-tiff --without-x --without-xim --without-xpm \
+			--without-xwidgets
+.else
+CONFIGURE_ARGS+=	--with-x
+.endif
+# See r468320 to determine if/when the next line can be removed
+CONFIGURE_ENV=		ac_cv_header_sys_sysinfo_h=no
+CONFLICTS_INSTALL=	emacs-devel emacs-devel_nox
+GNU_CONFIGURE=		yes
 INFO=		ada-mode auth autotype bovine calc ccmode cl dbus dired-x \
 		ebrowse ede ediff edt efaq eieio eintr elisp emacs emacs-gnutls \
 		emacs-mime epa erc ert eshell eudc eww flymake forms gnus \
@@ -42,17 +70,26 @@
 		sasl sc semantic ses sieve smtpmail speedbar srecode todo-mode \
 		tramp url vhdl-mode vip viper widget wisent woman
 INFO_PATH=	${DATADIR_REL}/info
+.if ${FLAVOR:U} != nox
+INSTALLS_ICONS=	yes
+.endif
+.if ${FLAVOR:U} == canna
+PLIST_FILES+=	${DATADIR}/${EMACS_VER}/lisp/canna.el.gz \
+		${DATADIR}/${EMACS_VER}/lisp/canna.elc \
+		${DATADIR}/${EMACS_VER}/lisp/isearch-ext.el.gz	\
+		${DATADIR}/${EMACS_VER}/lisp/isearch-ext.elc
+.endif
 PLIST_SUB=	EMACS_VER=${EMACS_VER} GNU_HOST=${CONFIGURE_TARGET}
 SUB_FILES=	sources.el
 SUB_LIST=	ARCHLIBDIR=${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET} \
 		EMACS_VER=${EMACS_VER} # sources.el
 
-OPTIONS_DEFINE=	ACL DBUS GCONF GNUTLS GSETTINGS LLDB M17N MAILUTILS MODULES OTF \
+OPTIONS_DEFINE=	ACL DBUS GCONF GNUTLS GSETTINGS LCMS2 M17N MAILUTILS MODULES OTF\
 		SCROLLBARS SOURCES XFT XIM XML XWIDGETS
 OPTIONS_DEFAULT=	ACL DBUS GCONF GIF GNUTLS GSETTINGS GTK3 JPEG KQUEUE \
-		M17N MAGICK MODULES OSS OTF PNG SCROLLBARS SOURCES SVG \
-		TIFF XFT XIM XML XPM
-OPTIONS_SUB=	YES
+		LCMS2 M17N MAGICK MAILUTILS MODULES OSS OTF PNG SCROLLBARS \
+		SOURCES SVG TIFF XFT XIM XML XPM
+
 OPTIONS_GROUP=	GRAPHICS
 OPTIONS_GROUP_GRAPHICS=	CAIRO GIF JPEG MAGICK PNG SVG TIFF XPM
 OPTIONS_RADIO=	FILENOTIFY SOUND X11TOOLKIT
@@ -60,6 +97,13 @@
 OPTIONS_RADIO_SOUND=	ALSA OSS
 OPTIONS_RADIO_X11TOOLKIT=	GTK2 GTK3 MOTIF XAW XAW3D
 
+.if ${FLAVOR:U} == nox
+OPTIONS_EXCLUDE=	ALSA CAIRO DBUS GCONF GFILE GIF GSETTINGS GTK2 GTK3 \
+			JPEG LCMS2 M17N MAGICK MOTIF OSS OTF PNG SCROLLBARS SVG \
+			TIFF XAW XAW3D XFT XIM XPM XWIDGETS
+.endif
+OPTIONS_SUB=	YES
+
 ACL_DESC=	Access control list support
 CAIRO_DESC=	Experimental Cairo library support     (implies PNG, XFT)
 FILENOTIFY_DESC=	File notification support
@@ -67,7 +111,6 @@
 GRAPHICS_DESC=	Graphics support
 GSETTINGS_DESC=	GSettings API for application settings
 KQUEUE_DESC=	File notification via kqueue
-LLDB_DESC=	LLDB support for GUD
 #LTO_DESC=	Enable link-time optimization
 MAGICK_DESC=	ImageMagick image processing support
 MAILUTILS_DESC=	Mail framework via GNU Mailutils
@@ -94,6 +137,7 @@
 GCONF_USE=		GNOME=gconf2
 GCONF_CONFIGURE_WITH=	gconf
 GFILE_CONFIGURE_ON=	--with-file-notification=gfile
+GFILE_USE=		GNOME=glib20
 GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 GIF_CONFIGURE_WITH=	gif
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
@@ -112,7 +156,8 @@
 JPEG_USES=		jpeg
 JPEG_CONFIGURE_WITH=	jpeg
 KQUEUE_CONFIGURE_ON=	--with-file-notification=kqueue
-LLDB_EXTRA_PATCHES=	${PATCHDIR}/extrapatch-lldb-gud.el
+LCMS2_CONFIGURE_WITH=	lcms2
+LCMS2_LIB_DEPENDS=	liblcms2.so:graphics/lcms2
 #LTO_CONFIGURE_ON=	--enable-link-time-optimization
 M17N_LIB_DEPENDS=	libm17n.so:devel/m17n-lib
 M17N_CONFIGURE_WITH=	m17n-flt
@@ -121,6 +166,7 @@
 MAILUTILS_CONFIGURE_WITH=	mailutils
 MAILUTILS_LIB_DEPENDS=	libmailutils.so:mail/mailutils
 MODULES_CONFIGURE_WITH=	modules
+MAILUTILS_PLIST_FILES_OFF=	libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}/movemail
 MOTIF_USES=		motif
 MOTIF_CONFIGURE_ON=	--with-x-toolkit=motif
 MOTIF_LIB_DEPENDS=	libXp.so:x11/libXp
@@ -130,6 +176,9 @@
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CONFIGURE_WITH=	png
 SCROLLBARS_CONFIGURE_WITH=	toolkit-scroll-bars
+.if ${FLAVOR:U} == canna
+SOURCES_PLIST_FILES=	${DATADIR}/${EMACS_VER}/src/canna.c
+.endif
 SVG_USE=		GNOME=cairo,librsvg2
 SVG_CONFIGURE_WITH=	rsvg
 SVG_IMPLIES=		PNG
@@ -154,39 +203,8 @@
 XWIDGETS_LIB_DEPENDS=	libwebkitgtk-3.0.so:www/webkit-gtk3
 XWIDGETS_IMPLIES=	GTK3
 
-.if ${FLAVOR:U} == canna
-CONFIGURE_ARGS+=	--with-canna
-PATCH_DIST_STRIP=	-p1
-PATCH_SITES=		http://www.gentei.org/~yuuji/software/emacs25canna/ \
-			http://distfiles.pirateparty.in/ashish/ \
-			LOCAL/ashish
-PATCHFILES=		emacs25.2canna-20170507.diff.gz
-PLIST_FILES+=		${DATADIR}/${EMACS_VER}/lisp/canna.el.gz \
-			${DATADIR}/${EMACS_VER}/lisp/canna.elc \
-			${DATADIR}/${EMACS_VER}/lisp/isearch-ext.el.gz \
-			${DATADIR}/${EMACS_VER}/lisp/isearch-ext.elc
-SOURCES_PLIST_FILES=	${DATADIR}/${EMACS_VER}/src/canna.c
-.endif
-.if ${FLAVOR:U} == nox
-CONFIGURE_ARGS+=	--with-sound=no --without-cairo --without-dbus \
-			--without-gconf --without-gif --without-gsettings \
-			--with-x-toolkit=no --without-jpeg --without-m17n-flt \
-			--without-imagemagick --without-libotf --without-png \
-			--without-toolkit-scroll-bars --without-rsvg \
-			--without-tiff --without-x --without-xim --without-xpm \
-			--without-xwidgets
-OPTIONS_EXCLUDE=	ALSA CAIRO DBUS GCONF GIF GSETTINGS GTK2 GTK3 JPEG \
-			M17N MAGICK MOTIF OSS OTF PNG SCROLLBARS SVG TIFF XAW \
-			XAW3D XFT XIM XPM XWIDGETS
-.else
-CONFIGURE_ARGS+=	--with-x
-INSTALLS_ICONS=		yes
-USE_XORG=		ice sm x11 xcb xext xfixes xinerama xmu xrandr xt
-USES+=			desktop-file-utils
-.endif
+EMACS_VER=		26.1
 
-EMACS_VER=	25.3
-
 .include <bsd.port.options.mk>
 
 # has graphics/ImageMagick been compiled with OPENMP?
@@ -194,10 +212,10 @@
 USES+=	compiler:openmp
 .endif
 
+.if ${FLAVOR} == nox
 # With a desktop entry stage-qa will give a warning about requiring
-# desktop-file-utils and portlint -C will give a warning about INSTALL_ICONS,
+# desktop-file-utils and portlint -C will give a warning about INSTALLS_ICONS,
 # but don't pull in those dependencies with the nox flavor.
-.if ${FLAVOR} == nox
 post-patch:
 	@${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' ${WRKSRC}/etc/emacs.desktop
 .endif
@@ -206,5 +224,8 @@
 	@${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
 	${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
 	${INSTALL_DATA} ${WRKDIR}/sources.el ${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
+
+post-install:
+	@${RM} -r ${STAGEDIR}${PREFIX}/lib/systemd
 
 .include <bsd.port.mk>
Index: head/editors/emacs/distinfo
===================================================================
--- head/editors/emacs/distinfo
+++ head/editors/emacs/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1505178274
-SHA256 (emacs-25.3.tar.xz) = 253ac5e7075e594549b83fd9ec116a9dc37294d415e2f21f8ee109829307c00b
-SIZE (emacs-25.3.tar.xz) = 42854740
-SHA256 (emacs25.2canna-20170507.diff.gz) = 16e05ef901fddafb16d8384ad9c047769e4c0757939036d1f8128359801bfd86
-SIZE (emacs25.2canna-20170507.diff.gz) = 31655
+TIMESTAMP = 1527559243
+SHA256 (emacs-26.1.tar.xz) = 1cf4fc240cd77c25309d15e18593789c8dbfba5c2b44d8f77c886542300fd32c
+SIZE (emacs-26.1.tar.xz) = 44258932
+SHA256 (emacs26.1-canna-20180529.diff.gz) = defe94426449a5d48c1b0b92c0a6051816b78dba25c600d38c06ab903d667ecb
+SIZE (emacs26.1-canna-20180529.diff.gz) = 30163
Index: head/editors/emacs/files/extrapatch-lldb-gud.el
===================================================================
--- head/editors/emacs/files/extrapatch-lldb-gud.el
+++ head/editors/emacs/files/extrapatch-lldb-gud.el
@@ -1,291 +0,0 @@
-This diff is retrieved from http://lists.gnu.org/archive/html/emacs-devel/2015-02/msg00274.html
-
-And traces its origin back to https://gitorious.org/lldb/lldb/commit/40e4dbf
-
-It's also present on Apple's OS site:
-
-http://www.opensource.apple.com/source/lldb/lldb-76/utils/emacs/
-
-diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
-index 42c5b20..7f2e9c0 100644
---- lisp/progmodes/gud.el
-+++ lisp/progmodes/gud.el
-@@ -35,7 +35,7 @@
- ;; kluge with the gud-xdb-directories hack producing gud-dbx-directories.
- ;; Derek L. Davies <ddavies@world.std.com> added support for jdb (Java
- ;; debugger.)  Jan Nieuwenhuizen added support for the Guile REPL (Guile
--;; debugger).
-+;; debugger). llvm.org added support for lldb.
- 
- ;;; Code:
- 
-@@ -56,7 +56,7 @@
- 
- (defgroup gud nil
-   "The \"Grand Unified Debugger\" interface.
--Supported debuggers include gdb, sdb, dbx, xdb, perldb,
-+Supported debuggers include lldb, gdb, sdb, dbx, xdb, perldb,
- pdb (Python), and jdb."
-   :group 'processes
-   :group 'tools)
-@@ -141,12 +141,12 @@ Used to gray out relevant toolbar icons.")
- 			       (display-graphic-p)
- 			       (fboundp 'x-show-tip))
- 		  :visible (memq gud-minor-mode
--				'(gdbmi guiler dbx sdb xdb pdb))
-+				'(lldb gdbmi guiler dbx sdb xdb pdb))
- 	          :button (:toggle . gud-tooltip-mode))
-     ([refresh]	"Refresh" . gud-refresh)
-     ([run]	menu-item "Run" gud-run
-                   :enable (not gud-running)
--		  :visible (memq gud-minor-mode '(gdbmi gdb dbx jdb)))
-+		  :visible (memq gud-minor-mode '(lldb gdbmi gdb dbx jdb)))
-     ([go]	menu-item (if (bound-and-true-p gdb-active-process)
- 			      "Continue" "Run") gud-go
- 		  :visible (and (eq gud-minor-mode 'gdbmi)
-@@ -164,18 +164,18 @@ Used to gray out relevant toolbar icons.")
-     ([tbreak]	menu-item "Temporary Breakpoint" gud-tbreak
-                   :enable (not gud-running)
- 		  :visible (memq gud-minor-mode
--				'(gdbmi gdb sdb xdb)))
-+				'(lldb gdbmi gdb sdb xdb)))
-     ([break]	menu-item "Set Breakpoint" gud-break
-                   :enable (not gud-running)
- 		  :visible (gud-tool-bar-item-visible-no-fringe))
-     ([up]	menu-item "Up Stack" gud-up
- 		  :enable (not gud-running)
- 		  :visible (memq gud-minor-mode
--				 '(gdbmi gdb guiler dbx xdb jdb pdb)))
-+				 '(lldb gdbmi gdb guiler dbx xdb jdb pdb)))
-     ([down]	menu-item "Down Stack" gud-down
- 		  :enable (not gud-running)
- 		  :visible (memq gud-minor-mode
--				 '(gdbmi gdb guiler dbx xdb jdb pdb)))
-+				 '(lldb gdbmi gdb guiler dbx xdb jdb pdb)))
-     ([pp]	menu-item "Print S-expression" gud-pp
-                   :enable (and (not gud-running)
- 				  (bound-and-true-p gdb-active-process))
-@@ -187,7 +187,7 @@ Used to gray out relevant toolbar icons.")
- 			      "Dump object"
- 			    "Print Dereference") gud-pstar
-                   :enable (not gud-running)
--		  :visible (memq gud-minor-mode '(gdbmi gdb jdb)))
-+		  :visible (memq gud-minor-mode '(lldb gdbmi gdb jdb)))
-     ([print]	menu-item "Print Expression" gud-print
-                   :enable (not gud-running))
-     ([watch]	menu-item "Watch Expression" gud-watch
-@@ -196,13 +196,13 @@ Used to gray out relevant toolbar icons.")
-     ([finish]	menu-item "Finish Function" gud-finish
-                   :enable (not gud-running)
- 		  :visible (memq gud-minor-mode
--				 '(gdbmi gdb guiler xdb jdb pdb)))
-+				 '(lldb gdbmi gdb guiler xdb jdb pdb)))
-     ([stepi]	menu-item "Step Instruction" gud-stepi
-                   :enable (not gud-running)
--		  :visible (memq gud-minor-mode '(gdbmi gdb dbx)))
-+		  :visible (memq gud-minor-mode '(lldb gdbmi gdb dbx)))
-     ([nexti]	menu-item "Next Instruction" gud-nexti
-                   :enable (not gud-running)
--		  :visible (memq gud-minor-mode '(gdbmi gdb dbx)))
-+		  :visible (memq gud-minor-mode '(lldb gdbmi gdb dbx)))
-     ([step]	menu-item "Step Line" gud-step
-                   :enable (not gud-running))
-     ([next]	menu-item "Next Line" gud-next
-@@ -237,7 +237,7 @@ Used to gray out relevant toolbar icons.")
- 	:visible (not (eq gud-minor-mode 'gdbmi)))
-        ([menu-bar run] menu-item
- 	,(propertize "run" 'face 'font-lock-doc-face) gud-run
--	:visible (memq gud-minor-mode '(gdbmi gdb dbx jdb)))
-+	:visible (memq gud-minor-mode '(lldb gdbmi gdb dbx jdb)))
-        ([menu-bar go] menu-item
- 	,(propertize " go " 'face 'font-lock-doc-face) gud-go
- 	:visible (and (eq gud-minor-mode 'gdbmi)
-@@ -356,6 +356,7 @@ are interpreted specially if present.  These are:
-   %l -- Number of current source line.
-   %e -- Text of the C lvalue or function-call expression surrounding point.
-   %a -- Text of the hexadecimal address surrounding point.
-+  %b -- Text of the most recently created breakpoint id.
-   %p -- Prefix argument to the command (if any) as a number.
-   %c -- Fully qualified class name derived from the expression
-         surrounding point (jdb only).
-@@ -964,6 +965,131 @@ SKIP is the number of chars to skip on each line, it defaults to 0."
- 
- 
- ;; ======================================================================
-+;; lldb functions
-+
-+;; History of argument lists passed to lldb.
-+(defvar gud-lldb-history nil)
-+
-+;; Keeps track of breakpoint created.  In the following case, the id is "1".
-+;; It is used to implement temporary breakpoint.
-+;; (lldb) b main.c:39
-+;; breakpoint set --file 'main.c' --line 39
-+;; Breakpoint created: 1: file ='main.c', line = 39, locations = 1
-+(defvar gud-breakpoint-id nil)
-+
-+(defun lldb-extract-breakpoint-id (string)
-+  ;; Search for "Breakpoint created: \\([^:\n]*\\):" pattern.
-+  (if (string-match "Breakpoint created: \\([^:\n]*\\):" string)
-+      (progn
-+        (setq gud-breakpoint-id (match-string 1 string))
-+        (message "breakpoint id: %s" gud-breakpoint-id)))
-+)
-+
-+(defun gud-lldb-marker-filter (string)
-+  (setq gud-marker-acc
-+	(if gud-marker-acc (concat gud-marker-acc string) string))
-+  (lldb-extract-breakpoint-id gud-marker-acc)
-+  (let (start)
-+    ;; Process all complete markers in this chunk
-+    (while (or
-+            ;; (lldb) r
-+            ;; Process 15408 launched: '/Volumes/data/lldb/svn/trunk/test/conditional_break/a.out' (x86_64)
-+            ;; (lldb) Process 15408 stopped
-+            ;; * thread #1: tid = 0x2e03, 0x0000000100000de8 a.out`c + 7 at main.c:39, stop reason = breakpoint 1.1, queue = com.apple.main-thread
-+            (string-match " at \\([^:\n]*\\):\\([0-9]*\\), stop reason = .*\n"
-+                          gud-marker-acc start)
-+            ;; (lldb) frame select -r 1
-+            ;; frame #1: 0x0000000100000e09 a.out`main + 25 at main.c:44
-+            (string-match "\nframe.* at \\([^:\n]*\\):\\([0-9]*\\)\n"
-+                           gud-marker-acc start))
-+      (setq gud-last-frame
-+            (cons (match-string 1 gud-marker-acc)
-+                  (string-to-number (match-string 2 gud-marker-acc)))
-+            start (match-end 0)))
-+
-+    ;; Search for the last incomplete line in this chunk
-+    (while (string-match "\n" gud-marker-acc start)
-+      (setq start (match-end 0)))
-+
-+    ;; If we have an incomplete line, store it in gud-marker-acc.
-+    (setq gud-marker-acc (substring gud-marker-acc (or start 0))))
-+  string)
-+
-+;; Keeps track of whether the Python lldb_oneshot_break function definition has
-+;; been exec'ed.
-+(defvar lldb-oneshot-break-defined nil)
-+
-+;;;###autoload
-+(defun lldb (command-line)
-+  "Run lldb on program FILE in buffer *gud-FILE*.
-+The directory containing FILE becomes the initial working directory
-+and source-file directory for your debugger."
-+  (interactive (list (gud-query-cmdline 'lldb)))
-+
-+  (gud-common-init command-line nil 'gud-lldb-marker-filter)
-+  (set (make-local-variable 'gud-minor-mode) 'lldb)
-+  (setq lldb-oneshot-break-defined nil)
-+
-+  (gud-def gud-listb  "breakpoint list"
-+                      "l"    "List all breakpoints.")
-+  (gud-def gud-bt     "thread backtrace"
-+                      "b"    "Show stack for the current thread.")
-+  (gud-def gud-bt-all "thread backtrace all"
-+                      "B"    "Show stacks for all the threads.")
-+
-+  (gud-def gud-break  "breakpoint set -f %f -l %l"
-+                      "\C-b" "Set breakpoint at current line.")
-+  (gud-def gud-tbreak
-+	   (progn (gud-call "breakpoint set -f %f -l %l")
-+                  (sit-for 1)
-+                  (if (not lldb-oneshot-break-defined)
-+                      (progn
-+                        ;; The "\\n"'s are required to escape the newline chars
-+                        ;; passed to the lldb process.
-+                        (gud-call (concat "script exec \"def lldb_oneshot_break(frame, bp_loc):\\n"
-+                                                        "    target=frame.GetThread().GetProcess().GetTarget()\\n"
-+                                                        "    bp=bp_loc.GetBreakpoint()\\n"
-+                                                        "    print 'Deleting oneshot breakpoint:', bp\\n"
-+                                                        "    target.BreakpointDelete(bp.GetID())\""))
-+                        (sit-for 1)
-+                        ;; Set the flag since Python knows about the function def now.
-+                        (setq lldb-oneshot-break-defined t)))
-+                  (gud-call "breakpoint command add -p %b -o 'lldb_oneshot_break(frame, bp_loc)'"))
-+	              "\C-t" "Set temporary breakpoint at current line.")
-+  (gud-def gud-remove "breakpoint clear -f %f -l %l"
-+                      "\C-d" "Remove breakpoint at current line")
-+  (gud-def gud-step   "thread step-in"
-+                      "\C-s" "Step one source line with display.")
-+  (gud-def gud-stepi  "thread step-inst"
-+                      "\C-i" "Step one instruction with display.")
-+  (gud-def gud-next   "thread step-over"
-+                      "\C-n" "Step one line (skip functions).")
-+  (gud-def gud-nexti  "thread step-inst-over"
-+                      nil    "Step one instruction (skip functions).")
-+  (gud-def gud-cont   "process continue"
-+                      "\C-r" "Continue with display.")
-+  (gud-def gud-finish "thread step-out"
-+                      "\C-f" "Finish executing current function.")
-+  (gud-def gud-up     "frame select -r %p"
-+                      "<"    "Up 1 stack frame.")
-+  (gud-def gud-down   "frame select -r -%p"
-+                      ">"    "Down 1 stack frame.")
-+  (gud-def gud-print  "expression -- %e"
-+                      "\C-p" "Evaluate C expression at point.")
-+  (gud-def gud-pstar  "expression -- *%e"
-+                      nil    "Evaluate C dereferenced pointer expression at point.")
-+  (gud-def gud-run    "run"
-+                      nil    "Run the program.")
-+  (gud-def gud-stop-subjob    "process kill"
-+                      nil    "Stop the program.")
-+
-+  (setq comint-prompt-regexp  "\\(^\\|\n\\)\\*")
-+  (setq paragraph-start comint-prompt-regexp)
-+  (run-hooks 'lldb-mode-hook)
-+  )
-+
-+
-+;; ======================================================================
- ;; sdb functions
- 
- ;; History of argument lists passed to sdb.
-@@ -2499,9 +2625,10 @@ gud, see `gud-mode'."
-   "Major mode for interacting with an inferior debugger process.
- 
-    You start it up with one of the commands M-x gdb, M-x sdb, M-x dbx,
--M-x perldb, M-x xdb, or M-x jdb.  Each entry point finishes by executing a
--hook; `gdb-mode-hook', `sdb-mode-hook', `dbx-mode-hook',
--`perldb-mode-hook', `xdb-mode-hook', or `jdb-mode-hook' respectively.
-+M-x perldb, M-x xdb, M-x jdb, or M-x lldb.  Each entry point finishes by
-+executing a hook; `gdb-mode-hook', `sdb-mode-hook', `dbx-mode-hook',
-+`perldb-mode-hook', `xdb-mode-hook', `jdb-mode-hook', or `lldb-mode-hook'
-+respectively.
- 
- After startup, the following commands are available in both the GUD
- interaction buffer and any source buffer GUD visits due to a breakpoint stop
-@@ -2531,7 +2658,7 @@ Under gdb, sdb and xdb, \\[gud-tbreak] behaves exactly like \\[gud-break],
- except that the breakpoint is temporary; that is, it is removed when
- execution stops on it.
- 
--Under gdb, dbx, and xdb, \\[gud-up] pops up through an enclosing stack
-+Under gdb, dbx, xdb, and lldb, \\[gud-up] pops up through an enclosing stack
- frame.  \\[gud-down] drops back down through one.
- 
- If you are using gdb or xdb, \\[gud-finish] runs execution to the return from
-@@ -2858,7 +2985,7 @@ Obeying it means displaying in another window the specified file and line."
- 	result)
-     (while (and str
- 		(let ((case-fold-search nil))
--		  (string-match "\\([^%]*\\)%\\([adefFlpc]\\)" str)))
-+		  (string-match "\\([^%]*\\)%\\([abdefFlpc]\\)" str)))
-       (let ((key (string-to-char (match-string 2 str)))
- 	    subst)
- 	(cond
-@@ -2886,6 +3013,8 @@ Obeying it means displaying in another window the specified file and line."
- 	  (setq subst (gud-find-expr)))
- 	 ((eq key ?a)
- 	  (setq subst (gud-read-address)))
-+	 ((eq key ?b)
-+	  (setq subst gud-breakpoint-id))
- 	 ((eq key ?c)
- 	  (setq subst
-                 (gud-find-class
-@@ -3520,6 +3649,7 @@ With arg, dereference expr if ARG is positive, otherwise do not dereference."
- (defun gud-tooltip-print-command (expr)
-   "Return a suitable command to print the expression EXPR."
-   (pcase gud-minor-mode
-+    (`lldb (concat "expression -o -- \"" expr "\""))
-     (`gdbmi (concat "-data-evaluate-expression \"" expr "\""))
-     (`guiler expr)
-     (`dbx (concat "print " expr))
Index: head/editors/emacs/pkg-plist
===================================================================
--- head/editors/emacs/pkg-plist
+++ head/editors/emacs/pkg-plist
@@ -5,7 +5,6 @@
 bin/emacsclient
 bin/etags
 libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/hexl
-libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/movemail
 libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/profile
 libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/rcs2log
 @(games,games,4555) libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/update-game-score
@@ -16,6 +15,11 @@
 man/man1/etags.1.gz
 share/appdata/emacs.appdata.xml
 share/applications/emacs.desktop
+%%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%-buffer.gdb
+%%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.appdata.xml
+%%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.desktop
+%%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.icon
+%%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.service
 %%DATADIR%%/%%EMACS_VER%%/etc/AUTHORS
 %%DATADIR%%/%%EMACS_VER%%/etc/CALC-NEWS
 %%DATADIR%%/%%EMACS_VER%%/etc/CENSORSHIP
@@ -46,6 +50,7 @@
 %%DATADIR%%/%%EMACS_VER%%/etc/NEWS.22
 %%DATADIR%%/%%EMACS_VER%%/etc/NEWS.23
 %%DATADIR%%/%%EMACS_VER%%/etc/NEWS.24
+%%DATADIR%%/%%EMACS_VER%%/etc/NEWS.25
 %%DATADIR%%/%%EMACS_VER%%/etc/NEXTSTEP
 %%DATADIR%%/%%EMACS_VER%%/etc/NXML-NEWS
 %%DATADIR%%/%%EMACS_VER%%/etc/ORDERS
@@ -193,10 +198,6 @@
 %%DATADIR%%/%%EMACS_VER%%/etc/e/eterm-color
 %%DATADIR%%/%%EMACS_VER%%/etc/e/eterm-color.ti
 %%DATADIR%%/%%EMACS_VER%%/etc/edt-user.el
-%%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%-buffer.gdb
-%%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.appdata.xml
-%%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.desktop
-%%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.icon
 %%DATADIR%%/%%EMACS_VER%%/etc/enriched.txt
 %%DATADIR%%/%%EMACS_VER%%/etc/forms/README
 %%DATADIR%%/%%EMACS_VER%%/etc/forms/forms-d2.dat
@@ -756,105 +757,6 @@
 %%DATADIR%%/%%EMACS_VER%%/etc/images/zoom-in.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/zoom-out.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/zoom-out.xpm
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00000-0007F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00080-000FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00100-0017F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00180-0024F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00250-002AF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/002B0-002FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00300-0036F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00370-003FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00400-004FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00500-0052F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00530-0058F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00590-005FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00600-006FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00700-0074F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00780-007BF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00900-0097F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00980-009FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00A00-00A7F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00A80-00AFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00B00-00B7F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00B80-00BFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00C00-00C7F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00C80-00CFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00D00-00D7F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00D80-00DFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00E00-00E7F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00E80-00EFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00F00-00FFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01000-0109F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/010A0-010FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01100-011FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01200-0137F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/013A0-013FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01400-0167F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01680-0169F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/016A0-016FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01700-0171F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01720-0173F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01740-0175F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01760-0177F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01780-017FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01800-018AF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01E00-01EFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01F00-01FFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02000-0206F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02070-0209F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/020A0-020CF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/020D0-020FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02100-0214F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02150-0218F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02190-021FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02200-022FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02300-023FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02400-0243F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02440-0245F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02460-024FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02500-0257F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02580-0259F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/025A0-025FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02600-026FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02700-027BF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/027C0-027EF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/027F0-027FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02800-028FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02900-0297F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02980-029FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02A00-02AFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02E80-02EFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02F00-02FDF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02FF0-02FFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/03000-0303F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/03040-0309F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/030A0-030FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/03100-0312F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/03130-0318F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/03190-0319F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/031A0-031BF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/031F0-031FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/03200-032FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/03300-033FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/03400-04DBF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0A000-0A48F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0A490-0A4CF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0FB00-0FB4F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0FB50-0FDFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0FE00-0FE0F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0FE20-0FE2F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0FE30-0FE4F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0FE50-0FE6F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0FE70-0FEFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0FF00-0FFEF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0FFF0-0FFFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/10300-1032F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/10330-1034F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/10400-1044F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/1D000-1D0FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/1D100-1D1FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/1D400-1D7FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/E0000-E007F.el
 %%DATADIR%%/%%EMACS_VER%%/etc/nxml/README
 %%DATADIR%%/%%EMACS_VER%%/etc/nxml/test-invalid.xml
 %%DATADIR%%/%%EMACS_VER%%/etc/nxml/test-valid.xml
@@ -867,25 +769,38 @@
 %%DATADIR%%/%%EMACS_VER%%/etc/publicsuffix.txt.gz
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/Makefile
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/README
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/calccard.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/calccard.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/cs-dired-ref.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/cs-dired-ref.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/cs-refcard.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/cs-refcard.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/cs-survival.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/cs-survival.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/de-refcard.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/de-refcard.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/dired-ref.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/dired-ref.tex
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/emacsver.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-dired-ref.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-dired-ref.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-refcard.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-refcard.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-survival.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-survival.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/gnus-booklet.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/gnus-logo.eps
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/gnus-logo.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/gnus-refcard.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/gnus-refcard.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/orgcard.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/orgcard.tex
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/pdflayout.sty
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/pl-refcard.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/pl-refcard.tex
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/pt-br-refcard.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/pt-br-refcard.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/refcard.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/refcard.tex
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/ru-refcard.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/ru-refcard.tex
@@ -895,25 +810,12 @@
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/sk-refcard.tex
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/sk-survival.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/sk-survival.tex
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/survival.tex
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/vipcard.tex
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/viperCard.tex
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/calccard.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/cs-dired-ref.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/cs-refcard.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/cs-survival.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/de-refcard.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/dired-ref.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-dired-ref.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-refcard.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-survival.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/gnus-booklet.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/gnus-refcard.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/orgcard.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/refcard.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/survival.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/survival.tex
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/vipcard.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/vipcard.tex
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/viperCard.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/viperCard.tex
 %%DATADIR%%/%%EMACS_VER%%/etc/rgb.txt
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/README
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/calstbl.rnc
@@ -924,6 +826,8 @@
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/dbstart.rnc
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/docbook.rnc
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/locate.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/od-manifest-schema-v1.2-os.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/od-schema-v1.2-os.rnc
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/rdfxml.rnc
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/relaxng.rnc
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/schemas.xml
@@ -1035,6 +939,10 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/arc-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/array.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/array.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/auth-source-pass.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/auth-source-pass.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/auth-source.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/auth-source.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/autoarg.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/autoarg.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/autoinsert.el.gz
@@ -1553,6 +1461,7 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/dframe.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/dired-aux.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/dired-aux.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/dired-loaddefs.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/dired-x.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/dired-x.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/dired.el.gz
@@ -1561,6 +1470,8 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/dirtrack.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/disp-table.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/disp-table.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/display-line-numbers.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/display-line-numbers.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/dnd.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/dnd.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/doc-view.el.gz
@@ -1581,6 +1492,8 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/ebuff-menu.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/echistory.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/echistory.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/ecomplete.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/ecomplete.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/edmacro.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/edmacro.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/ehelp.el.gz
@@ -1630,6 +1543,8 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-macs.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-preloaded.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-preloaded.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-print.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-print.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-seq.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl-seq.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cl.el.gz
@@ -1662,6 +1577,7 @@
 %%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-loaddefs.el
 %%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
@@ -1718,6 +1634,8 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/pcase.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/pp.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/pp.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/radix-tree.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/radix-tree.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/re-builder.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/re-builder.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/regexp-opt.el.gz
@@ -1726,6 +1644,8 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/regi.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/ring.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/ring.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/rmc.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/rmc.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/rx.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/rx.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/seq.el.gz
@@ -1748,6 +1668,8 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/testcover.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/thunk.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/thunk.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/timer-list.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/timer-list.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/timer.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/timer.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/tq.el.gz
@@ -1995,18 +1917,10 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/generic-x.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/generic-x.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/.dir-locals.el
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/auth-source.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/auth-source.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/canlock.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/canlock.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/compface.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/compface.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/deuglify.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/deuglify.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/ecomplete.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/ecomplete.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/flow-fill.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/flow-fill.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gmm-utils.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gmm-utils.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-agent.el.gz
@@ -2041,8 +1955,6 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-dup.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-eform.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-eform.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-ems.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-ems.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-fun.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-fun.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-gravatar.el.gz
@@ -2075,6 +1987,8 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-range.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-registry.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-registry.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-rfc1843.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-rfc1843.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-salt.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-salt.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-score.el.gz
@@ -2089,8 +2003,6 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-start.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-sum.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-sum.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-sync.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-sync.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-topic.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-topic.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-undo.el.gz
@@ -2105,28 +2017,14 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-win.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gravatar.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gravatar.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gssapi.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gssapi.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/html2text.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/html2text.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/ietf-drums.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/ietf-drums.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/legacy-gnus-agent.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/legacy-gnus-agent.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/mail-parse.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/mail-parse.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/mail-prsvr.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/mail-prsvr.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/mail-source.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/mail-source.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/mailcap.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/mailcap.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/message.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/message.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/messcompat.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/messcompat.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/mm-archive.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/mm-archive.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/mm-bodies.el.gz
@@ -2209,32 +2107,8 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnvirtual.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnweb.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnweb.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/plstore.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/plstore.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/pop3.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/pop3.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/qp.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/qp.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/registry.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/registry.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/rfc1843.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/rfc1843.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/rfc2045.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/rfc2045.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/rfc2047.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/rfc2047.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/rfc2231.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/rfc2231.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/rtree.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/rtree.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/score-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/score-mode.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/sieve-manage.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/sieve-manage.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/sieve-mode.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/sieve-mode.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/sieve.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/sieve.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/smiley.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/smiley.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/smime.el.gz
@@ -2247,14 +2121,6 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/spam-wash.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/spam.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/spam.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/starttls.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/starttls.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/utf7.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/utf7.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/yenc.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/yenc.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gs.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gs.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/help-at-pt.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/help-at-pt.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/help-fns.el.gz
@@ -2279,12 +2145,14 @@
 %%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-loaddefs.el
 %%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
 %%DATADIR%%/%%EMACS_VER%%/lisp/ibuf-macs.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/ibuffer-loaddefs.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/ibuffer.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/ibuffer.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/icomplete.el.gz
@@ -2303,6 +2171,10 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/image-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/image.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/image.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/image/compface.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/image/compface.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/image/gravatar.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/image/gravatar.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/imenu.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/imenu.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/indent.el.gz
@@ -2315,7 +2187,6 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/info.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/informat.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/informat.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/international/README
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/ccl.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/ccl.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/characters.el.gz
@@ -2363,6 +2234,8 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/ogonek.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/quail.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/quail.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/international/rfc1843.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/international/rfc1843.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/robin.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/robin.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/titdic-cnv.el.gz
@@ -2382,10 +2255,15 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/uni-name.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/uni-numeric.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/uni-old-name.el
+%%DATADIR%%/%%EMACS_VER%%/lisp/international/uni-special-lowercase.el
+%%DATADIR%%/%%EMACS_VER%%/lisp/international/uni-special-titlecase.el
+%%DATADIR%%/%%EMACS_VER%%/lisp/international/uni-special-uppercase.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/uni-titlecase.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/uni-uppercase.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/utf-7.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/utf-7.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/international/utf7.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/international/utf7.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/isearch.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/isearch.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/isearchb.el.gz
@@ -2625,14 +2503,22 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/emacsbug.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/feedmail.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/feedmail.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/flow-fill.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/flow-fill.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/footnote.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/footnote.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/hashcash.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/hashcash.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/ietf-drums.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/ietf-drums.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/mail-extr.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/mail-extr.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/mail-hist.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/mail-hist.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/mail-parse.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/mail-parse.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/mail-prsvr.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/mail-prsvr.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/mail-utils.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/mail-utils.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/mailabbrev.el.gz
@@ -2647,12 +2533,21 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/metamail.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/mspools.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/mspools.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/qp.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/qp.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/reporter.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/reporter.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc2045.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc2045.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc2047.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc2047.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc2231.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc2231.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc2368.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc2368.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc822.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc822.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/rmail-loaddefs.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rmail-spam-filter.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rmail-spam-filter.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rmail.el.gz
@@ -2685,6 +2580,8 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/unrmail.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/uudecode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/uudecode.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/yenc.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/yenc.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/makesum.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/makesum.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/man.el.gz
@@ -2704,14 +2601,16 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/mh-e/mh-buffers.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mh-e/mh-comp.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mh-e/mh-comp.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/mh-e/mh-compat.el
+%%DATADIR%%/%%EMACS_VER%%/lisp/mh-e/mh-compat.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mh-e/mh-compat.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mh-e/mh-e.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mh-e/mh-e.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mh-e/mh-folder.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mh-e/mh-folder.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mh-e/mh-funcs.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mh-e/mh-funcs.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/mh-e/mh-gnus.el
+%%DATADIR%%/%%EMACS_VER%%/lisp/mh-e/mh-gnus.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mh-e/mh-gnus.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mh-e/mh-identity.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mh-e/mh-identity.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mh-e/mh-inc.el.gz
@@ -2777,6 +2676,8 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/dig.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/dns.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/dns.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-export.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-export.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-hotlist.el.gz
@@ -2787,8 +2688,6 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-bbdb.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-bbdb.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-ldap.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-ldap.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-mab.el.gz
@@ -2807,6 +2706,8 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/imap.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/ldap.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/ldap.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/mailcap.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/mailcap.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/mairix.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/mairix.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/net-utils.el.gz
@@ -2831,8 +2732,10 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/nsm.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/ntlm.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/ntlm.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/net/pinentry.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/net/pinentry.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/pop3.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/pop3.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/puny.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/puny.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/quickurl.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/quickurl.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/rcirc.el.gz
@@ -2857,6 +2760,12 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/shr-color.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/shr.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/shr.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/sieve-manage.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/sieve-manage.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/sieve-mode.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/sieve-mode.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/sieve.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/sieve.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/snmp-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/snmp-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/soap-client.el.gz
@@ -2865,6 +2774,8 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/soap-inspect.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/socks.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/socks.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/starttls.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/starttls.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/telnet.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/telnet.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tls.el.gz
@@ -2881,8 +2792,6 @@
 %%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-loaddefs.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-sh.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-sh.elc
@@ -2906,8 +2815,6 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/novice.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-enc.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-enc.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-glyph.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-glyph.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-maint.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-maint.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-mode.el.gz
@@ -2920,8 +2827,6 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-parse.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-rap.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-rap.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-uchnm.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-uchnm.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-util.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-util.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/rng-cmpct.el.gz
@@ -2958,8 +2863,6 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/abbrevlist.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/assoc.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/assoc.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/awk-mode.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/awk-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/bruce.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/bruce.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cc-compat.el.gz
@@ -2978,18 +2881,14 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/eudcb-ph.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/fast-lock.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/fast-lock.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/gs.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/gs.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/gulp.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/gulp.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/iso-acc.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/iso-acc.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/iso-insert.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/iso-insert.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/iso-swed.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/iso-swed.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/html2text.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/html2text.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/iswitchb.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/iswitchb.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/keyswap.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/keyswap.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/landmark.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/landmark.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/lazy-lock.el.gz
@@ -3008,6 +2907,7 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/mailpost.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/meese.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/meese.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/messcompat.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/mouse-sel.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/mouse-sel.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/old-emacs-lock.el.gz
@@ -3038,22 +2938,12 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/pgg.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/rcompile.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/rcompile.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/resume.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/resume.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/s-region.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/s-region.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/scribe.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/scribe.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/spell.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/spell.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sregex.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sregex.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sup-mouse.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sup-mouse.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/terminal.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/terminal.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/tpu-edt.el.gz
@@ -3076,8 +2966,12 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/yow.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-C.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-C.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-J.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-J.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-R.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-R.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-abc.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-abc.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-asymptote.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-asymptote.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-awk.el.gz
@@ -3088,6 +2982,8 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-clojure.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-comint.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-comint.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-coq.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-coq.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-core.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-core.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-css.el.gz
@@ -3096,18 +2992,26 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-ditaa.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-dot.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-dot.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-ebnf.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-ebnf.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-emacs-lisp.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-emacs-lisp.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-eval.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-eval.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-exp.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-exp.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-forth.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-forth.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-fortran.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-fortran.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-gnuplot.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-gnuplot.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-groovy.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-groovy.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-haskell.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-haskell.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-hledger.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-hledger.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-io.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-io.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-java.el.gz
@@ -3126,6 +3030,8 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-lisp.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-lob.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-lob.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-lua.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-lua.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-makefile.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-makefile.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-matlab.el.gz
@@ -3146,6 +3052,8 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-picolisp.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-plantuml.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-plantuml.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-processing.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-processing.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-python.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-python.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-ref.el.gz
@@ -3154,24 +3062,28 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-ruby.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-sass.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-sass.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-scala.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-scala.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-scheme.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-scheme.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-screen.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-screen.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-sh.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-sh.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-sed.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-sed.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-shell.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-shell.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-shen.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-shen.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-sql.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-sql.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-sqlite.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-sqlite.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-stan.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-stan.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-table.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-table.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-tangle.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-tangle.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-vala.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-vala.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-agenda.el.gz
@@ -3200,12 +3112,16 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-datetree.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-docview.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-docview.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-duration.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-duration.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-element.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-element.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-entities.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-entities.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-eshell.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-eshell.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-eww.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-eww.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
@@ -3227,6 +3143,8 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-install.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-irc.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-irc.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-lint.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-lint.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-list.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-list.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-loaddefs.el
@@ -3303,6 +3221,8 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/pcmpl-x.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/pcomplete.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/pcomplete.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/pixel-scroll.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/pixel-scroll.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/play/5x5.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/play/5x5.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/play/animate.el.gz
@@ -3353,6 +3273,8 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/play/tetris.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/play/zone.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/play/zone.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/plstore.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/plstore.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/printing.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/printing.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/proced.el.gz
@@ -3443,6 +3365,8 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/executable.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/f90.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/f90.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/flymake-proc.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/flymake-proc.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/flymake.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/flymake.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/fortran.el.gz
@@ -3539,6 +3463,7 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/ps-def.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/ps-mule.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/ps-mule.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/ps-print-loaddefs.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/ps-print.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/ps-print.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/ps-samp.el.gz
@@ -3549,6 +3474,8 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/rect.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/register.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/register.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/registry.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/registry.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/repeat.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/repeat.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/replace.el.gz
@@ -3561,6 +3488,8 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/rfn-eshadow.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/rot13.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/rot13.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/rtree.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/rtree.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/ruler-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/ruler-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/savehist.el.gz
@@ -3602,6 +3531,8 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/subdirs.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/subr.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/subr.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/svg.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/svg.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/t-mouse.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/t-mouse.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/tabify.el.gz
@@ -3627,6 +3558,8 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/internal.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/iris-ansi.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/iris-ansi.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/term/konsole.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/term/konsole.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/linux.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/linux.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/lk201.el.gz
@@ -3643,6 +3576,8 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/screen.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/sun.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/sun.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/term/tmux.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/term/tmux.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/tty-colors.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/tty-colors.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/tvi970.el.gz
@@ -3683,8 +3618,12 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/flyspell.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/ispell.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/ispell.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/less-css-mode.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/less-css-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/makeinfo.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/makeinfo.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/mhtml-mode.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/mhtml-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/nroff-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/nroff-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/page-ext.el.gz
@@ -3713,6 +3652,7 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-global.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-index.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-index.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-loaddefs.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-parse.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-parse.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-ref.el.gz
@@ -3957,6 +3897,8 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/woman.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/x-dnd.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/x-dnd.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/xdg.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/xdg.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/xml.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/xml.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/xt-mouse.el.gz
@@ -3964,6 +3906,14 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/xwidget.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/xwidget.elc
 %%DATADIR%%/%%EMACS_VER%%/site-lisp/subdirs.el
+%%DATADIR%%/%%EMACS_VER%%/src/lcms.c
+%%DATADIR%%/%%EMACS_VER%%/src/module-env-25.h
+%%DATADIR%%/%%EMACS_VER%%/src/module-env-26.h
+%%DATADIR%%/%%EMACS_VER%%/src/sheap.h
+%%DATADIR%%/%%EMACS_VER%%/src/systhread.c
+%%DATADIR%%/%%EMACS_VER%%/src/systhread.h
+%%DATADIR%%/%%EMACS_VER%%/src/thread.c
+%%DATADIR%%/%%EMACS_VER%%/src/thread.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/site-lisp/site-start.el
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/alloc.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/atimer.c