editors/emacs: Update to 28.1

https://git.savannah.gnu.org/cgit/emacs.git/tree/etc/NEWS.28

Reviewed by:	ashish
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D34779

4 files changed, 187 insertions, 89 deletions

diff --git a/Mk/Uses/emacs.mk b/Mk/Uses/emacs.mk
index a51e5ab8dccb..e2c19e5f53c1 100644
--- a/Mk/Uses/emacs.mk
+++ b/Mk/Uses/emacs.mk
@@ -34,15 +34,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-27.1)
+# EMACS_CMD:                  Emacs command with full path (e.g. /usr/local/bin/emacs-28.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/27.1)
-# EMACS_MAJOR_VER:            Emacs major version (e.g. 27)
+# EMACS_LIBDIR_WITH_VER:      Library directory without ${PREFIX} including version (e.g. share/emacs/28.1)
+# EMACS_MAJOR_VER:            Emacs major version (e.g. 28)
 # 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. 27.1)
-# EMACS_VERSION_SITE_LISPDIR: Include version (e.g. share/emacs/27.1/site-lisp)
+# EMACS_VER:                  Emacs version (e.g. 28.1)
+# EMACS_VERSION_SITE_LISPDIR: Include version (e.g. share/emacs/28.1/site-lisp)
 #-------------------------------------------------------------------------------
 #
 # MAINTAINER:	emacs@FreeBSD.org
@@ -108,7 +108,7 @@ EMACS_FLAVOR=	full
 EMACS_VER=		29.0.50
 EMACS_PORTDIR=		editors/emacs-devel
 .else
-EMACS_VER=		27.2
+EMACS_VER=		28.1
 EMACS_PORTDIR=		editors/emacs
 .endif
 
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index a67b1e3cf4e1..c008bd8a278b 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,8 +1,7 @@
 # Created by: MANTANI Nobutaka <nobutaka@nobutaka.com>
 
 PORTNAME=	emacs
-DISTVERSION=	27.2
-PORTREVISION=	2
+DISTVERSION=	28.1
 PORTEPOCH=	3
 CATEGORIES=	editors
 MASTER_SITES=	GNU
@@ -40,7 +39,9 @@ USE_XORG=	ice sm x11 xcb xext xfixes xinerama xmu xrandr xt
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--disable-build-details \
-			--localstatedir=/var
+			--localstatedir=/var \
+			--without-libsystemd \
+			--without-selinux
 .if ${FLAVOR:U} == canna
 CONFIGURE_ARGS+=	--with-canna
 .endif
@@ -79,10 +80,11 @@ SUB_LIST=	EMACS_VER=${DISTVERSION}
 INFO=		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 htmlfontify \
-		idlwave ido info mairix-el message mh-e newsticker nxml-mode \
-		octave-mode org pcl-cvs pgg rcirc reftex remember sasl sc \
-		semantic ses sieve smtpmail speedbar srecode todo-mode tramp \
-		url vhdl-mode vip viper widget wisent woman
+		idlwave ido info mairix-el message mh-e modus-themes newsticker \
+		nxml-mode octave-mode org pcl-cvs pgg rcirc reftex remember \
+		sasl sc semantic ses sieve smtpmail speedbar srecode todo-mode \
+		tramp transient url vhdl-mode vip viper widget wisent woman
+
 INFO_PATH=	${DATADIR_REL}/info
 .if ${FLAVOR:U} == canna
 PLIST_FILES+=	${DATADIR}/${DISTVERSION}/lisp/canna.el.gz \
@@ -94,8 +96,9 @@ PLIST_SUB=	EMACS_VER=${DISTVERSION} \
 		GNU_HOST=${CONFIGURE_TARGET}
 
 OPTIONS_DEFINE=			ACL DBUS FCITXPATCH GCONF GNUTLS GSETTINGS \
-				HARFBUZZ JSON LCMS2 M17N MAILUTILS MODULES OTF \
-				SCROLLBARS SOURCES THREADS XFT XIM XML XWIDGETS
+				HARFBUZZ JSON LCMS2 M17N MAILUTILS MODULES \
+				NATIVECOMP OTF SCROLLBARS SOURCES THREADS XFT \
+				XIM XML XWIDGETS
 OPTIONS_DEFAULT=		ACL CAIRO DBUS GIF GNUTLS GSETTINGS GTK3 \
 				HARFBUZZ JPEG JSON KQUEUE LCMS2 M17N MAILUTILS \
 				MODULES OSS OTF PNG SCROLLBARS SOURCES SVG \
@@ -127,6 +130,7 @@ M17N_DESC=		M17N support for text-shaping [implies XFT]
 MAGICK_DESC=		ImageMagick image processing support (deprecated)
 MAILUTILS_DESC=		Mail framework via GNU Mailutils
 MODULES_DESC=		Dynamic modules support
+NATIVECOMP_DESC=	Emacs Lisp native compiler support (experimental)
 OTF_DESC=		Opentype fonts [implies XFT]
 SCROLLBARS_DESC=	Toolkit scroll-bars
 SOURCES_DESC=		Install sources
@@ -184,6 +188,10 @@ MAILUTILS_CONFIGURE_ENV_OFF=	ac_cv_lib_lockfile_maillock=no \
 MODULES_CONFIGURE_WITH=		modules
 MOTIF_USES=			motif
 MOTIF_CONFIGURE_ON=		--with-x-toolkit=motif
+NATIVECOMP_LIB_DEPENDS=		libgccjit.so:lang/${_GCC_PORT}
+NATIVECOMP_CONFIGURE_WITH=	native-compilation
+NATIVECOMP_MAKE_ARGS=		NATIVE_FULL_AOT=1
+NATIVECOMP_LDFLAGS=		-L${LOCALBASE}/lib/${_GCC_PORT}
 OSS_CONFIGURE_ON=		--with-sound=oss
 OTF_IMPLIES=			XFT
 OTF_LIB_DEPENDS=		libotf.so:print/libotf
@@ -228,8 +236,12 @@ XWIDGETS_CONFIGURE_WITH=	xwidgets
 USE_GCC=	yes
 .endif
 
-.if !${PORT_OPTIONS:MGTK2} && !${PORT_OPTIONS:MGTK3} && !${PORT_OPTIONS:MMOTIF} \
-	&& !${PORT_OPTIONS:MXAW} && !${PORT_OPTIONS:MXAW3D}
+.if ${PORT_OPTIONS:MNATIVECOMP} && !defined(_GCC_PORT_CHOSEN)
+_GCC_PORT!=	${BSDMAKE} -V_GCC_PORT USE_GCC=11+ _GCC_PORT_CHOSEN=yes
+.endif
+
+.if !${PORT_OPTIONS:MGTK2} && !${PORT_OPTIONS:MGTK3} && !${PORT_OPTIONS:MMOTIF} && \
+	!${PORT_OPTIONS:MXAW} && !${PORT_OPTIONS:MXAW3D}
 CONFIGURE_ARGS+=	--with-x-toolkit=no
 .endif
 
@@ -248,6 +260,12 @@ post-install-MAILUTILS-on:
 	${LN} -sf ${PREFIX}/bin/movemail \
 		${STAGEDIR}${PREFIX}/libexec/emacs/${DISTVERSION}/${CONFIGURE_TARGET}
 
+# Natively compiled elisp files names include build checksum information, so add
+# these files to the plist after the build.
+post-install-NATIVECOMP-on:
+	@(cd ${WRKSRC} && ${FIND} native-lisp -type f | ${SED} -e 's,^,lib/emacs/${DISTVERSION}/,') >> ${TMPPLIST}
+#	@${FIND} ${STAGEDIR}${PREFIX}/lib/emacs/${DISTVERSION:R}/native-lisp/ -name '*.eln*' -exec ${STRIP_CMD} {} +
+
 post-install-SOURCES-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/${DISTVERSION}/src
 	${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${STAGEDIR}${DATADIR}/${DISTVERSION}/src
diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo
index 2772ff93d947..9c9ee4352388 100644
--- a/editors/emacs/distinfo
+++ b/editors/emacs/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1616684962
-SHA256 (emacs-27.2.tar.xz) = b4a7cc4e78e63f378624e0919215b910af5bb2a0afc819fad298272e9f40c1b9
-SIZE (emacs-27.2.tar.xz) = 44624480
+TIMESTAMP = 1649086307
+SHA256 (emacs-28.1.tar.xz) = 28b1b3d099037a088f0a4ca251d7e7262eab5ea1677aabffa6c4426961ad75e1
+SIZE (emacs-28.1.tar.xz) = 47699512
 SHA256 (emacs27.0.90-canna-20200308.diff.gz) = af22f2f671fdc0a21844e015b141bc2d6798dd8ffb63bb6928385acb0cea4ab5
 SIZE (emacs27.0.90-canna-20200308.diff.gz) = 30415
diff --git a/editors/emacs/pkg-plist b/editors/emacs/pkg-plist
index c76363a5a28b..55d434a855d5 100644
--- a/editors/emacs/pkg-plist
+++ b/editors/emacs/pkg-plist
@@ -15,12 +15,18 @@ man/man1/emacs.1.gz
 man/man1/emacsclient.1.gz
 man/man1/etags.1.gz
 share/applications/emacs.desktop
-share/metainfo/emacs.appdata.xml
+share/applications/emacs-mail.desktop
+share/applications/emacsclient.desktop
+share/applications/emacsclient-mail.desktop
+share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%-buffer.gdb
-%%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.appdata.xml
+%%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%-mail.desktop
 %%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.desktop
 %%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.icon
+%%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.service
+%%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%client-mail.desktop
+%%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%client.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/AUTHORS
 %%DATADIR%%/%%EMACS_VER%%/etc/CALC-NEWS
 %%DATADIR%%/%%EMACS_VER%%/etc/COPYING
@@ -47,6 +53,7 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/etc/NEWS.24
 %%DATADIR%%/%%EMACS_VER%%/etc/NEWS.25
 %%DATADIR%%/%%EMACS_VER%%/etc/NEWS.26
+%%DATADIR%%/%%EMACS_VER%%/etc/NEWS.27
 %%DATADIR%%/%%EMACS_VER%%/etc/NEXTSTEP
 %%DATADIR%%/%%EMACS_VER%%/etc/NXML-NEWS
 %%DATADIR%%/%%EMACS_VER%%/etc/ORG-NEWS
@@ -210,6 +217,8 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/etc/images/bookmark_add.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/cancel.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/cancel.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/checkbox-mixed.svg
+%%DATADIR%%/%%EMACS_VER%%/etc/images/checked.svg
 %%DATADIR%%/%%EMACS_VER%%/etc/images/checked.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/close.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/close.xpm
@@ -240,6 +249,7 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/etc/images/diropen.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/disconnect.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/disconnect.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/down.svg
 %%DATADIR%%/%%EMACS_VER%%/etc/images/exit.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/exit.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/README
@@ -498,6 +508,7 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/etc/images/jump-to.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/left-arrow.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/left-arrow.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/left.svg
 %%DATADIR%%/%%EMACS_VER%%/etc/images/letter.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/letter.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/lock-broken.pbm
@@ -614,12 +625,16 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/etc/images/prev-node.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/print.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/print.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/radio-checked.svg
+%%DATADIR%%/%%EMACS_VER%%/etc/images/radio-mixed.svg
+%%DATADIR%%/%%EMACS_VER%%/etc/images/radio.svg
 %%DATADIR%%/%%EMACS_VER%%/etc/images/redo.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/redo.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/refresh.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/refresh.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/right-arrow.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/right-arrow.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/right.svg
 %%DATADIR%%/%%EMACS_VER%%/etc/images/save.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/save.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/saveas.pbm
@@ -746,6 +761,7 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/folder/open.png
 %%DATADIR%%/%%EMACS_VER%%/etc/images/tree-widget/folder/open.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/unchecked.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/unchecked.svg
 %%DATADIR%%/%%EMACS_VER%%/etc/images/unchecked.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/undo.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/undo.xpm
@@ -753,6 +769,7 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/etc/images/up-arrow.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/up-node.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/up-node.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/up.svg
 %%DATADIR%%/%%EMACS_VER%%/etc/images/zoom-in.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/zoom-in.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/zoom-out.pbm
@@ -763,38 +780,65 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/etc/org/OrgOdtContentTemplate.xml
 %%DATADIR%%/%%EMACS_VER%%/etc/org/OrgOdtStyles.xml
 %%DATADIR%%/%%EMACS_VER%%/etc/org/README
+%%DATADIR%%/%%EMACS_VER%%/etc/org/csl/README
+%%DATADIR%%/%%EMACS_VER%%/etc/org/csl/chicago-author-date.csl
+%%DATADIR%%/%%EMACS_VER%%/etc/org/csl/locales-en-US.xml
 %%DATADIR%%/%%EMACS_VER%%/etc/package-keyring.gpg
 %%DATADIR%%/%%EMACS_VER%%/etc/ps-prin0.ps
 %%DATADIR%%/%%EMACS_VER%%/etc/ps-prin1.ps
 %%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
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/sk-dired-ref.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/sk-dired-ref.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/sk-refcard.pdf
 %%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.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/OpenDocument-schema-v1.3+libreoffice.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/OpenDocument-schema-v1.3.rnc
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/README
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/calstbl.rnc
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/dbcalstbl.rnc
@@ -805,7 +849,6 @@ share/metainfo/emacs.appdata.xml
 %%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
@@ -869,6 +912,9 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/etc/themes/light-blue-theme.el
 %%DATADIR%%/%%EMACS_VER%%/etc/themes/manoj-dark-theme.el
 %%DATADIR%%/%%EMACS_VER%%/etc/themes/misterioso-theme.el
+%%DATADIR%%/%%EMACS_VER%%/etc/themes/modus-operandi-theme.el
+%%DATADIR%%/%%EMACS_VER%%/etc/themes/modus-themes.el
+%%DATADIR%%/%%EMACS_VER%%/etc/themes/modus-vivendi-theme.el
 %%DATADIR%%/%%EMACS_VER%%/etc/themes/tango-dark-theme.el
 %%DATADIR%%/%%EMACS_VER%%/etc/themes/tango-theme.el
 %%DATADIR%%/%%EMACS_VER%%/etc/themes/tsdh-dark-theme.el
@@ -1182,8 +1228,6 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/system.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/util.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/util.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/inversion.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/inversion.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/mode-local.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/mode-local.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/pulse.el.gz
@@ -1276,6 +1320,8 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/grammar-wy.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/grammar.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/grammar.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/grm-wy-boot.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/grm-wy-boot.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/html.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/html.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/ia-sb.el.gz
@@ -1533,6 +1579,10 @@ share/metainfo/emacs.appdata.xml
 %%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/comp-cstr.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/comp-cstr.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/comp.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/comp.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/copyright.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/copyright.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/crm.el.gz
@@ -1594,6 +1644,8 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/gv.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/helper.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/helper.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/hierarchy.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/hierarchy.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/inline.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/inline.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/let-alist.el.gz
@@ -1610,6 +1662,8 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/map-ynp.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/map.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/map.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/memory-report.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/memory-report.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/nadvice.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/nadvice.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/package-x.el.gz
@@ -1638,6 +1692,10 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/seq.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/shadow.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/shadow.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/shortdoc.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/shortdoc.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/shorthands.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/shorthands.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/smie.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/smie.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/subr-x.el.gz
@@ -1648,8 +1706,6 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/tabulated-list.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/tcover-ses.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/tcover-ses.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/tcover-unsafep.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/tcover-unsafep.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/testcover.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/testcover.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/text-property-search.el.gz
@@ -1712,6 +1768,8 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/epa-file.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/epa-hook.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/epa-hook.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/epa-ks.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/epa-ks.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/epa-mail.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/epa-mail.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/epa.el.gz
@@ -1783,6 +1841,8 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-spelling.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-stamp.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-stamp.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-status-sidebar.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-status-sidebar.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-track.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-track.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-truncate.el.gz
@@ -1907,7 +1967,6 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/fringe.elc
 %%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/canlock.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/canlock.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/deuglify.el.gz
@@ -1932,6 +1991,8 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-cloud.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-cus.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-cus.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-dbus.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-dbus.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-delay.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-delay.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-demon.el.gz
@@ -1984,6 +2045,8 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-salt.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-score.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-score.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-search.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-search.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-sieve.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-sieve.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-spec.el.gz
@@ -2068,8 +2131,6 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnheader.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnimap.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnimap.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnir.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnir.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnmail.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnmail.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnmaildir.el.gz
@@ -2090,6 +2151,8 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnregistry.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnrss.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnrss.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnselect.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnselect.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnspool.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnspool.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nntp.el.gz
@@ -2191,6 +2254,8 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/charscript.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/cp51932.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/cp51932.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/international/emoji-zwj.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/international/emoji-zwj.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/eucjp-ms.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/eucjp-ms.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/fontset.el.gz
@@ -2395,6 +2460,10 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/ZOZY.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/arabic.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/arabic.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/cham.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/cham.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/compose.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/compose.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/croatian.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/croatian.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/cyril-jis.el.gz
@@ -2530,8 +2599,6 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/mailclient.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/mailheader.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/mailheader.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/mail/metamail.el.gz
-%%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
@@ -2544,8 +2611,8 @@ share/metainfo/emacs.appdata.xml
 %%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/rfc6068.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc6068.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc822.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc822.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rmail-loaddefs.el
@@ -2673,6 +2740,10 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/browse-url.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/dbus.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/dbus.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/dictionary-connection.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/dictionary-connection.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/dictionary.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/dictionary.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/dig.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/dig.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/dns.el.gz
@@ -2693,6 +2764,8 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-ldap.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-mab.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-mab.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-macos-contacts.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-macos-contacts.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eww.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eww.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/gnutls.el.gz
@@ -2753,6 +2826,8 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/sasl-ntlm.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/sasl-scram-rfc.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/sasl-scram-rfc.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/sasl-scram-sha256.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/sasl-scram-sha256.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/sasl.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/sasl.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/secrets.el.gz
@@ -2787,8 +2862,12 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-cmds.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-compat.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-compat.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-crypt.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-crypt.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-ftp.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-ftp.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-fuse.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-fuse.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-gvfs.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-gvfs.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-integration.el.gz
@@ -2800,6 +2879,8 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-sh.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-smb.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-smb.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-sshfs.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-sshfs.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-sudoedit.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-sudoedit.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-uu.el.gz
@@ -2896,22 +2977,16 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/html2text.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/info-edit.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/info-edit.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/inversion.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/inversion.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/iswitchb.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/iswitchb.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
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/lazy-lock.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/ledit.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/ledit.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/levents.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/levents.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/lmenu.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/lmenu.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/longlines.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/longlines.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/lucid.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/lucid.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/mailpost.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/mailpost.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/mantemp.el.gz
@@ -2919,12 +2994,14 @@ share/metainfo/emacs.appdata.xml
 %%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/metamail.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/metamail.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/mouse-sel.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/mouse-sel.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/nnir.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/nnir.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/old-emacs-lock.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/old-emacs-lock.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/old-whitespace.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/old-whitespace.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/otodo-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/otodo-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/patcomp.el.gz
@@ -2947,8 +3024,12 @@ share/metainfo/emacs.appdata.xml
 %%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/rfc2368.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/rfc2368.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/s-region.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/s-region.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sb-image.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sb-image.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sregex.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sregex.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/starttls.el.gz
@@ -2979,14 +3060,8 @@ share/metainfo/emacs.appdata.xml
 %%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
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-awk.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-calc.el.gz
@@ -2995,8 +3070,6 @@ share/metainfo/emacs.appdata.xml
 %%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
@@ -3005,8 +3078,6 @@ share/metainfo/emacs.appdata.xml
 %%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-eshell.el.gz
@@ -3025,18 +3096,14 @@ share/metainfo/emacs.appdata.xml
 %%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
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-java.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-js.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-js.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-julia.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-julia.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-latex.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-latex.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-ledger.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-ledger.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-lilypond.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-lilypond.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-lisp.el.gz
@@ -3051,8 +3118,6 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-matlab.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-maxima.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-maxima.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-mscgen.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-mscgen.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-ocaml.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-ocaml.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-octave.el.gz
@@ -3061,8 +3126,6 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-org.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-perl.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-perl.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-picolisp.el.gz
-%%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
@@ -3083,28 +3146,34 @@ share/metainfo/emacs.appdata.xml
 %%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/oc-basic.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/oc-basic.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/oc-biblatex.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/oc-biblatex.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/oc-csl.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/oc-csl.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/oc-natbib.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/oc-natbib.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/oc.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/oc.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-bbdb.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-bbdb.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-bibtex.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-bibtex.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-docview.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-docview.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-doi.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-doi.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-eshell.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-eshell.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-eww.el.gz
@@ -3115,6 +3184,8 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-info.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-irc.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-irc.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-man.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-man.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-mhe.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-mhe.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ol-rmail.el.gz
@@ -3191,8 +3262,8 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-plot.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-protocol.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-protocol.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-refile.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-refile.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-refile.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-src.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-src.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-table.el.gz
@@ -3212,6 +3283,8 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ox-html.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ox-icalendar.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ox-icalendar.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ox-koma-letter.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ox-koma-letter.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ox-latex.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ox-latex.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ox-man.el.gz
@@ -3346,6 +3419,8 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-vars.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cfengine.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cfengine.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cl-font-lock.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cl-font-lock.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cmacexp.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cmacexp.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/compile.el.gz
@@ -3515,8 +3590,6 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/savehist.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/saveplace.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/saveplace.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/sb-image.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/sb-image.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/scroll-all.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/scroll-all.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/scroll-bar.el.gz
@@ -3599,6 +3672,8 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/rxvt.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/screen.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/screen.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/term/st.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/term/st.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/sun.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/sun.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/tmux.el.gz
@@ -3637,6 +3712,8 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/dns-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/enriched.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/enriched.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/etc-authors-mode.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/etc-authors-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/fill.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/fill.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/flyspell.el.gz
@@ -3702,6 +3779,7 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/tex-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/texinfmt.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/texinfmt.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/texinfo-loaddefs.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/texinfo.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/texinfo.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/texnfo-upd.el.gz
@@ -3732,6 +3810,8 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/tool-bar.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/tooltip.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/tooltip.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/transient.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/transient.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/tree-widget.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/tree-widget.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/tutorial.el.gz
@@ -3932,26 +4012,13 @@ share/metainfo/emacs.appdata.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/xwidget.elc
 %%DATADIR%%/%%EMACS_VER%%/site-lisp/subdirs.el
 %%DATADIR%%/site-lisp/subdirs.el
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/bignum.c
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/bignum.h
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/hbfont.c
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/json.c
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/mini-gmp-emacs.c
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/mini-gmp.c
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/mini-gmp.h
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/module-env-27.h
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/pdumper.c
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/pdumper.h
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/ptr-bounds.h
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/regex-emacs.c
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/regex-emacs.h
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/timefns.c
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32cygwinx.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/site-lisp/site-start.el
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/alloc.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/atimer.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/atimer.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/bidi.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/bignum.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/bignum.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/blockinput.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/buffer.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/buffer.h
@@ -3976,6 +4043,8 @@ share/metainfo/emacs.appdata.xml
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/coding.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/coding.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/commands.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/comp.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/comp.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/composite.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/composite.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/conf_post.h
@@ -4019,7 +4088,6 @@ share/metainfo/emacs.appdata.xml
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/ftcrfont.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/ftfont.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/ftfont.h
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/ftxfont.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/getpagesize.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/gfilenotify.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/globals.h
@@ -4028,6 +4096,7 @@ share/metainfo/emacs.appdata.xml
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/gnutls.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/gtkutil.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/gtkutil.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/hbfont.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/image.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/indent.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/indent.h
@@ -4035,6 +4104,7 @@ share/metainfo/emacs.appdata.xml
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/insdel.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/intervals.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/intervals.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/json.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/keyboard.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/keyboard.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/keymap.c
@@ -4054,16 +4124,23 @@ share/metainfo/emacs.appdata.xml
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/minibuf.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/module-env-25.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/module-env-26.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/module-env-27.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/module-env-28.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/msdos.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/msdos.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/nsgui.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/nsterm.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/nsxwidget.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/pdumper.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/pdumper.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/print.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/process.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/process.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/profiler.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/puresize.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/ralloc.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/regex-emacs.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/regex-emacs.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/region-cache.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/region-cache.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/scroll.c
@@ -4092,6 +4169,7 @@ share/metainfo/emacs.appdata.xml
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/textprop.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/thread.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/thread.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/timefns.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/tparam.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/tparam.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/undo.c
@@ -4110,12 +4188,14 @@ share/metainfo/emacs.appdata.xml
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32common.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32console.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32cygwinx.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32fns.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32font.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32font.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32gui.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32heap.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32heap.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32image.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32inevt.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32inevt.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32menu.c