editors/emacs: Update to 30.1

Release announcement:	https://lists.gnu.org/archive/html/info-gnu-emacs/2025-02/msg00009.html
Submitted by:	HIROSE yuuji <yuuji@gentei.org> (updated canna patch)
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D48432

5 files changed, 280 insertions, 61 deletions

diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 6ffe918f33c8..dee8fe54055c 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,13 +1,12 @@
 PORTNAME=	emacs
-DISTVERSION=	29.4
-PORTREVISION=	2
+DISTVERSION=	30.1
 PORTEPOCH=	3
 CATEGORIES=	editors
 MASTER_SITES=	GNU
 
 .if ${FLAVOR:U} == canna
-PATCH_SITES+=	https://www.gentei.org/~yuuji/software/emacs29canna/:canna
-PATCHFILES+=	emacs29.1-canna-20230730.diff.xz:-p1:canna
+PATCH_SITES+=	https://www.gentei.org/~yuuji/software/emacs30canna/:canna
+PATCHFILES+=	emacs30.1-canna-20250224.diff.gz:-p1:canna
 .endif
 
 MAINTAINER=	emacs@FreeBSD.org
@@ -37,7 +36,6 @@ USES=		cpe gmake localbase:ldflags ncurses pkgconfig tar:xz
 CPE_VENDOR=	gnu
 
 GNU_CONFIGURE=		yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=		--disable-build-details \
 			--localstatedir=/var \
 			--without-gconf \
@@ -80,7 +78,9 @@ CONFLICTS_INSTALL=	emacs-devel emacs-devel-nox
 
 BINARY_ALIAS=	makeinfo=true
 SUB_FILES=	sources.el
-SUB_LIST=	EMACS_VER=${DISTVERSION}
+SUB_LIST=	EMACS_VER=${DISTVERSION} \
+		NATIVECOMP_COMMENT_END=${NATIVECOMP_COMMENT_END} \
+		NATIVECOMP_COMMENT_START=${NATIVECOMP_COMMENT_START}
 
 INFO=		auth autotype bovine calc ccmode cl dbus dired-x ebrowse ede \
 		ediff edt efaq eglot eieio eintr elisp emacs emacs-gnutls \
@@ -100,14 +100,14 @@ PLIST_FILES+=	${DATADIR}/${DISTVERSION}/lisp/canna.el.gz \
 PLIST_SUB=	EMACS_VER=${DISTVERSION} \
 		GNU_HOST=${CONFIGURE_TARGET}
 
-OPTIONS_DEFINE=			ACL DBUS GNUTLS GSETTINGS HARFBUZZ JSON LCMS2 \
-				M17N MAILUTILS MODULES NATIVECOMP OTF PGTK \
+OPTIONS_DEFINE=			ACL DBUS GNUTLS GSETTINGS HARFBUZZ LCMS2 M17N \
+				MAILUTILS MODULES NATIVECOMP OTF PGTK \
 				SCROLLBARS SOURCES SQLITE3 THREADS TREESITTER \
 				XFT XIM XML XWIDGETS
 OPTIONS_DEFAULT=		ACL CAIRO DBUS GIF GNUTLS GSETTINGS GTK3 \
-				HARFBUZZ JPEG JSON KQUEUE LCMS2 MAILUTILS \
-				MODULES OSS PNG SCROLLBARS SOURCES SQLITE3 SVG \
-				THREADS TIFF TREESITTER WEBP XIM XML XPM
+				HARFBUZZ JPEG KQUEUE LCMS2 MAILUTILS MODULES \
+				NATIVECOMP OSS PNG SCROLLBARS SOURCES SQLITE3 \
+				SVG THREADS TIFF TREESITTER WEBP XIM XML XPM
 OPTIONS_GROUP=			GRAPHICS
 OPTIONS_GROUP_GRAPHICS=		CAIRO GIF JPEG MAGICK PNG SVG TIFF WEBP XPM
 OPTIONS_RADIO=			FILENOTIFY SOUND X11TOOLKIT
@@ -183,8 +183,6 @@ HARFBUZZ_LIB_DEPENDS=		libharfbuzz.so:print/harfbuzz
 HARFBUZZ_CONFIGURE_WITH=	harfbuzz
 JPEG_USES=			jpeg
 JPEG_CONFIGURE_WITH=		jpeg
-JSON_LIB_DEPENDS=		libjansson.so:devel/jansson
-JSON_CONFIGURE_WITH=		json
 KQUEUE_CONFIGURE_ON=		--with-file-notification=kqueue
 LCMS2_LIB_DEPENDS=		liblcms2.so:graphics/lcms2
 LCMS2_CONFIGURE_WITH=		lcms2
@@ -194,7 +192,7 @@ M17N_LIB_DEPENDS=		libm17n.so:devel/m17n-lib
 M17N_CONFIGURE_WITH=		m17n-flt
 MAGICK_USES=			magick:7
 MAGICK_CONFIGURE_WITH=		imagemagick
-MAILUTILS_LIB_DEPENDS=		libmailutils.so:mail/mailutils
+MAILUTILS_RUN_DEPENDS=		mailutils:mail/mailutils
 MAILUTILS_CONFIGURE_WITH=	mailutils
 MAILUTILS_CONFIGURE_ENV_OFF=	ac_cv_lib_lockfile_maillock=no \
 				ac_cv_prog_liblockfile=no
@@ -210,7 +208,7 @@ PGTK_IMPLIES=			CAIRO GTK3 SCROLLBARS
 PGTK_PREVENTS=			M17N XFT XPM
 PGTK_CATEGORIES=		wayland
 PGTK_CONFIGURE_WITH=		pgtk
-PNG_LIB_DEPENDS=		libpng.so:graphics/png
+PNG_LIB_DEPENDS=		libpng16.so:graphics/png
 PNG_CONFIGURE_WITH=		png
 SCROLLBARS_CONFIGURE_WITH=	toolkit-scroll-bars
 .if ${FLAVOR:U} == canna
@@ -227,7 +225,7 @@ TIFF_CONFIGURE_WITH=		tiff
 TREESITTER_IMPLIES=		MODULES
 TREESITTER_LIB_DEPENDS=		libtree-sitter.so:devel/tree-sitter
 TREESITTER_CONFIGURE_WITH=	tree-sitter
-WEBP_LIB_DEPENDS=		libwebp.so:graphics/webp
+WEBP_LIB_DEPENDS=		libwebpdemux.so:graphics/webp
 WEBP_CONFIGURE_WITH=		webp
 XAW3D_LIB_DEPENDS=		libXaw3d.so:x11-toolkits/Xaw3d
 XAW3D_CONFIGURE_ON=		--with-x-toolkit=athena
@@ -253,6 +251,14 @@ XWIDGETS_CONFIGURE_WITH=	xwidgets
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MNATIVECOMP}
+NATIVECOMP_COMMENT_END=
+NATIVECOMP_COMMENT_START=
+.else
+NATIVECOMP_COMMENT_END=		'*/'
+NATIVECOMP_COMMENT_START=	'/*'
+.endif
+
 .if ${FLAVOR:U} != nox
 USES+=		desktop-file-utils gnome
 .if !${PORT_OPTIONS:MPGTK}
diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo
index 5830c821414f..6928533ab5ca 100644
--- a/editors/emacs/distinfo
+++ b/editors/emacs/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1719179787
-SHA256 (emacs-29.4.tar.xz) = ba897946f94c36600a7e7bb3501d27aa4112d791bfe1445c61ed28550daca235
-SIZE (emacs-29.4.tar.xz) = 52210344
-SHA256 (emacs29.1-canna-20230730.diff.xz) = 03741d173d86823409e42906f47cbd3c924cf88ec25cc3e228c4827a96243125
-SIZE (emacs29.1-canna-20230730.diff.xz) = 26852
+TIMESTAMP = 1740416719
+SHA256 (emacs-30.1.tar.xz) = 6ccac1ae76e6af93c6de1df175e8eb406767c23da3dd2a16aa67e3124a6f138f
+SIZE (emacs-30.1.tar.xz) = 54978160
+SHA256 (emacs30.1-canna-20250224.diff.gz) = b93296ae41037e6457317fd1113f8c3f659f32d4310c28a6a5bf633f6fcd31e5
+SIZE (emacs30.1-canna-20250224.diff.gz) = 30488
diff --git a/editors/emacs/files/patch-tty-rgb b/editors/emacs/files/patch-tty-rgb
deleted file mode 100644
index 812edf247b57..000000000000
--- a/editors/emacs/files/patch-tty-rgb
+++ /dev/null
@@ -1,34 +0,0 @@
-Add RGB fallback if environment has COLORTERM=truecolor
-https://github.com/emacs-mirror/emacs/commit/50f489b5dc59
-
---- doc/misc/efaq.texi.orig	2019-01-07 14:26:06 UTC
-+++ doc/misc/efaq.texi
-@@ -1603,6 +1603,10 @@ Currently there's no standard way to determine whether
- supports direct color mode.  If such standard arises later on, support
- for @samp{setb24} and @samp{setf24} may be removed.
- 
-+If Terminfo database is not available, but 24-bit direct color mode is
-+supported, it can still be enabled by defining the environment
-+variable @env{COLORTERM} to @samp{truecolor}.
-+
- @node Debugging a customization file
- @section How do I debug a @file{.emacs} file?
- @cindex Debugging @file{.emacs} file
---- src/term.c.orig	2019-01-07 14:26:07 UTC
-+++ src/term.c
-@@ -4157,6 +4157,15 @@ use the Bourne shell command 'TERM=...; export TERM' (
- 	    tty->TS_set_background = bg;
- 	    tty->TN_max_colors = 16777216;
- 	  }
-+	/* Fall back to xterm+direct (semicolon version) if requested
-+	   by the COLORTERM environment variable.  */
-+	else if ((bg = getenv("COLORTERM")) != NULL
-+		 && strcasecmp(bg, "truecolor") == 0)
-+	  {
-+	    tty->TS_set_foreground = "\033[%?%p1%{8}%<%t3%p1%d%e38;2;%p1%{65536}%/%d;%p1%{256}%/%{255}%&%d;%p1%{255}%&%d%;m";
-+	    tty->TS_set_background = "\033[%?%p1%{8}%<%t4%p1%d%e48;2;%p1%{65536}%/%d;%p1%{256}%/%{255}%&%d;%p1%{255}%&%d%;m";
-+	    tty->TN_max_colors = 16777216;
-+	  }
-       }
- #endif
- 
diff --git a/editors/emacs/files/pkg-message.in b/editors/emacs/files/pkg-message.in
new file mode 100644
index 000000000000..7d67c2378a22
--- /dev/null
+++ b/editors/emacs/files/pkg-message.in
@@ -0,0 +1,75 @@
+[
+%%NATIVECOMP_COMMENT_START%%
+{ type: install
+  message: <<EOM
+Emacs is now built with native compilation enabled by default, which
+requires GCC version 11 or later.  However, it is known that some
+elisp applications don't work correctly when compiled.  You can work
+around any such issues by disabling native compilation using the
+following steps.
+
+1. Add the following lines at the top of your Emacs configuration:
+
+(setq native-comp-deferred-compilation nil
+comp-enable-subr-trampolines nil)
+
+2. Exit emacs
+
+3. rm -rf ~/.emacs.d/eln-cache
+
+4. Start emacs again
+
+Whereas all elisp files included in the Emacs source archive are
+native compiled at build time, 3rd party elisp files (for example,
+from elisp ports/packages) are native compiled at run time. This will
+result in high CPU usage when they are compiled. If this annoys you,
+you can throttle the number of jobs by changing the value of the
+variable 'native-comp-async-jobs-number' in your emacs
+configuration. See the output of `C-h v native-comp-async-jobs-number`
+for details.
+EOM
+}
+{ type: upgrade
+  message: <<EOM
+Emacs is now built with native compilation enabled by default, which
+requires GCC version 11 or later.  However, it is known that some
+elisp applications don't work correctly when compiled.  You can work
+around any such issues by disabling native compilation using the
+following steps.
+
+1. Add the following lines at the top of your Emacs configuration:
+
+(setq native-comp-deferred-compilation nil
+comp-enable-subr-trampolines nil)
+
+2. Exit emacs
+
+3. rm -rf ~/.emacs.d/eln-cache
+
+4. Start emacs again
+
+Whereas all elisp files included in the Emacs source archive are
+native compiled at build time, 3rd party elisp files (for example,
+from elisp ports/packages) are native compiled at run time. This will
+result in high CPU usage when they are compiled. If this annoys you,
+you can throttle the number of jobs by changing the value of the
+variable 'native-comp-async-jobs-number' in your emacs
+configuration. See the output of `C-h v native-comp-async-jobs-number`
+for details.
+EOM
+}
+%%NATIVECOMP_COMMENT_END%%
+{ type: upgrade
+  maximum_version: "28.0.50.20210302,2"
+  message: <<EOM
+If you get the error
+
+    Symbol's value as variable is void: minor-modes
+
+rebuild the offending Emacs packages.
+
+See https://lists.gnu.org/archive/html/emacs-devel/2021-02/msg01164.html
+for details.
+EOM
+}
+]
diff --git a/editors/emacs/pkg-plist b/editors/emacs/pkg-plist
index 02b2dbca8e59..d77dc38d600d 100644
--- a/editors/emacs/pkg-plist
+++ b/editors/emacs/pkg-plist
@@ -56,6 +56,8 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/etc/NEWS.26
 %%DATADIR%%/%%EMACS_VER%%/etc/NEWS.27
 %%DATADIR%%/%%EMACS_VER%%/etc/NEWS.28
+%%DATADIR%%/%%EMACS_VER%%/etc/NEWS.29
+%%DATADIR%%/%%EMACS_VER%%/etc/NEWS.unknown
 %%DATADIR%%/%%EMACS_VER%%/etc/NEXTSTEP
 %%DATADIR%%/%%EMACS_VER%%/etc/NXML-NEWS
 %%DATADIR%%/%%EMACS_VER%%/etc/ORG-NEWS
@@ -63,6 +65,7 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/etc/README
 %%DATADIR%%/%%EMACS_VER%%/etc/TERMS
 %%DATADIR%%/%%EMACS_VER%%/etc/TODO
+%%DATADIR%%/%%EMACS_VER%%/etc/copyright-assign.txt
 %%DATADIR%%/%%EMACS_VER%%/etc/charsets/8859-10.map
 %%DATADIR%%/%%EMACS_VER%%/etc/charsets/8859-11.map
 %%DATADIR%%/%%EMACS_VER%%/etc/charsets/8859-13.map
@@ -212,6 +215,7 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/etc/gnus/news-server.ast
 %%DATADIR%%/%%EMACS_VER%%/etc/grep.txt
 %%DATADIR%%/%%EMACS_VER%%/etc/images/README
+%%DATADIR%%/%%EMACS_VER%%/etc/images/alt.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/attach.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/attach.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/back-arrow.pbm
@@ -225,6 +229,10 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/etc/images/checked.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/close.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/close.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/commit.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/commit.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/conceal.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/conceal.svg
 %%DATADIR%%/%%EMACS_VER%%/etc/images/connect-to-url.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/connect-to-url.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/connect.pbm
@@ -233,6 +241,7 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/etc/images/contact.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/copy.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/copy.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/ctrl.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/custom/README
 %%DATADIR%%/%%EMACS_VER%%/etc/images/custom/down-pushed.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/custom/down-pushed.xpm
@@ -314,12 +323,15 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/etc/images/ezimage/unlock.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/fwd-arrow.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/fwd-arrow.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/gen-changelog.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/gen-changelog.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/README
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/followup.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/followup.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/fuwo.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/fuwo.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/gnus-pointer.svg
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/gnus-pointer.xbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/gnus-pointer.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/gnus.png
@@ -397,6 +409,7 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/etc/images/help.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/home.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/home.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/hyper.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/icons/README
 %%DATADIR%%/%%EMACS_VER%%/etc/images/icons/allout-widgets/dark-bg/closed.png
 %%DATADIR%%/%%EMACS_VER%%/etc/images/icons/allout-widgets/dark-bg/closed.xpm
@@ -465,13 +478,19 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/etc/images/index.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/info.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/info.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/ins-changelog.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/ins-changelog.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/jump-to.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/jump-to.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/last-page.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/last-page.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/load-changelog.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/load-changelog.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/lock-broken.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/lock-broken.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/lock-ok.pbm
@@ -538,6 +557,7 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/send.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/send.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mail/spam.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/meta.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mh-logo.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mh-logo.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/mpc/README
@@ -597,6 +617,8 @@ share/metainfo/emacs.metainfo.xml
 %%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/reveal.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/reveal.svg
 %%DATADIR%%/%%EMACS_VER%%/etc/images/right-arrow.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/right-arrow.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/right.svg
@@ -610,6 +632,7 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/etc/images/search.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/separator.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/separator.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/shift.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/show.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/show.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/smilies/README
@@ -682,6 +705,56 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/etc/images/splash.png
 %%DATADIR%%/%%EMACS_VER%%/etc/images/splash.svg
 %%DATADIR%%/%%EMACS_VER%%/etc/images/splash.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/super.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/README
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/check-mark_16.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/check-mark_16.svg
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/chevron_down_16.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/chevron_down_16.svg
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/chevron_left_16.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/chevron_left_16.svg
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/chevron_right_16.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/chevron_right_16.svg
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/chevron_up_16.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/chevron_up_16.svg
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/cross_16.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/cross_16.svg
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/cross_circle_16.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/cross_circle_16.svg
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/cross_circle_fill_16.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/cross_circle_fill_16.svg
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/dot_large_16.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/dot_large_16.svg
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/dot_medium_16.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/dot_medium_16.svg
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/dot_small_16.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/dot_small_16.svg
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/heart_16.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/heart_16.svg
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/heart_fill_16.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/heart_fill_16.svg
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/heart_half_16.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/heart_half_16.svg
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/menu_16.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/menu_16.svg
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/minus_16.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/minus_16.svg
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/minus_circle_16.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/minus_circle_16.svg
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/minus_circle_fill_16.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/minus_circle_fill_16.svg
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/plus_16.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/plus_16.svg
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/plus_circle_16.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/plus_circle_16.svg
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/plus_circle_fill_16.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/plus_circle_fill_16.svg
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/star_16.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/star_16.svg
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/star_fill_16.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/star_fill_16.svg
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/star_half_16.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/symbols/star_half_16.svg
 %%DATADIR%%/%%EMACS_VER%%/etc/images/tabs/README
 %%DATADIR%%/%%EMACS_VER%%/etc/images/tabs/close.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/tabs/left-arrow.xpm
@@ -739,6 +812,8 @@ share/metainfo/emacs.metainfo.xml
 %%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/view-diff.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/view-diff.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/zoom-in.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/zoom-in.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/zoom-out.pbm
@@ -818,7 +893,14 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/dbpool.rnc
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/dbstart.rnc
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/docbook.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/dotnet-appconfig.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/dotnet-packages-config.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/dotnet-packages-props.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/dotnet-resx.rnc
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/locate.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/msbuild.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/nuget.rnc
+%%DATADIR%%/%%EMACS_VER%%/etc/schema/nuspec.rnc
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/od-manifest-schema-v1.2-os.rnc
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/rdfxml.rnc
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/relaxng.rnc
@@ -884,9 +966,15 @@ share/metainfo/emacs.metainfo.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-deuteranopia-theme.el
 %%DATADIR%%/%%EMACS_VER%%/etc/themes/modus-operandi-theme.el
+%%DATADIR%%/%%EMACS_VER%%/etc/themes/modus-operandi-tinted-theme.el
+%%DATADIR%%/%%EMACS_VER%%/etc/themes/modus-operandi-tritanopia-theme.el
 %%DATADIR%%/%%EMACS_VER%%/etc/themes/modus-themes.el
+%%DATADIR%%/%%EMACS_VER%%/etc/themes/modus-vivendi-deuteranopia-theme.el
 %%DATADIR%%/%%EMACS_VER%%/etc/themes/modus-vivendi-theme.el
+%%DATADIR%%/%%EMACS_VER%%/etc/themes/modus-vivendi-tinted-theme.el
+%%DATADIR%%/%%EMACS_VER%%/etc/themes/modus-vivendi-tritanopia-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
@@ -954,6 +1042,8 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/avoid.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/battery.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/battery.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/bind-key.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/bind-key.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/bindings.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/bindings.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/bookmark.el.gz
@@ -1440,6 +1530,8 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/color.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/comint.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/comint.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/completion-preview.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/completion-preview.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/completion.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/completion.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/composite.el.gz
@@ -1507,6 +1599,18 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/echistory.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/ecomplete.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/ecomplete.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/editorconfig-conf-mode.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/editorconfig-conf-mode.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/editorconfig-core-handle.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/editorconfig-core-handle.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/editorconfig-core.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/editorconfig-core.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/editorconfig-fnmatch.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/editorconfig-fnmatch.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/editorconfig-tools.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/editorconfig-tools.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/editorconfig.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/editorconfig.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/edmacro.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/edmacro.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/ehelp.el.gz
@@ -1561,10 +1665,16 @@ share/metainfo/emacs.metainfo.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-common.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/comp-common.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-run.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/comp-run.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/comp.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/comp.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/compat.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/compat.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
@@ -1605,6 +1715,8 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/elint.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/elp.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/elp.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/ert-font-lock.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/ert-font-lock.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/ert-x.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/ert-x.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/ert.el.gz
@@ -1715,6 +1827,8 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/tq.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/trace.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/trace.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/track-changes.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/track-changes.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/unsafep.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/unsafep.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/vtable.el.gz
@@ -1821,6 +1935,8 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-netsplit.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-networks.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-networks.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-nicks.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-nicks.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-notify.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-notify.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-page.el.gz
@@ -1897,12 +2013,12 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/eshell/esh-cmd.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/eshell/esh-ext.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/eshell/esh-ext.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/eshell/esh-groups.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/eshell/esh-groups.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/eshell/esh-io.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/eshell/esh-io.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/eshell/esh-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/eshell/esh-mode.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/eshell/esh-module-loaddefs.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/eshell/esh-module-loaddefs.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/eshell/esh-module.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/eshell/esh-module.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/eshell/esh-opt.el.gz
@@ -2084,8 +2200,6 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gssapi.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gssapi.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-source.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/mail-source.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/message.el.gz
@@ -2122,6 +2236,8 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/mml2015.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnagent.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnagent.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnatom.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnatom.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnbabyl.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnbabyl.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nndiary.el.gz
@@ -2134,6 +2250,8 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nndraft.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nneething.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nneething.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnfeed.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnfeed.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnfolder.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnfolder.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nngateway.el.gz
@@ -2258,6 +2376,8 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/image/wallpaper.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/imenu.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/imenu.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/indent-aux.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/indent-aux.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/indent.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/indent.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/info-look.el.gz
@@ -2553,6 +2673,8 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/lrt.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/misc-lang.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/misc-lang.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/pakistan.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/pakistan.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/persian.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/persian.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/philippine.el.gz
@@ -2897,6 +3019,8 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/telnet.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-adb.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-adb.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-androidsu.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-androidsu.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-archive.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-archive.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-cache.el.gz
@@ -2919,6 +3043,8 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-integration.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-loaddefs.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-loaddefs.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-message.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-message.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-rclone.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-rclone.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-sh.el.gz
@@ -3272,6 +3398,8 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/org-datetree.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-ast.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/org-element-ast.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
@@ -3529,8 +3657,12 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/eglot.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/elisp-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/elisp-mode.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/elixir-ts-mode.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/elixir-ts-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/erts-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/erts-mode.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/etags-regen.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/etags-regen.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/etags.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/etags.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/executable.el.gz
@@ -3555,6 +3687,8 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/grep.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/gud.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/gud.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/heex-ts-mode.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/heex-ts-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/hideif.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/hideif.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/hideshow.el.gz
@@ -3581,6 +3715,8 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/json-ts-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/ld-script.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/ld-script.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/lua-ts-mode.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/lua-ts-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/m4-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/m4-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/make-mode.el.gz
@@ -3597,8 +3733,12 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/opascal.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/pascal.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/pascal.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/peg.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/peg.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/perl-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/perl-mode.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/php-ts-mode.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/php-ts-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/prog-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/prog-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/project.el.gz
@@ -3739,6 +3879,8 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/AT386.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/AT386.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/README
+%%DATADIR%%/%%EMACS_VER%%/lisp/term/android-win.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/term/android-win.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/bobcat.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/bobcat.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/common-win.el.gz
@@ -3821,6 +3963,8 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/flyspell.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/glyphless-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/glyphless-mode.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/html-ts-mode.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/html-ts-mode.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
@@ -3924,6 +4068,8 @@ share/metainfo/emacs.metainfo.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/touch-screen.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/touch-screen.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/transient.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/transient.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/tree-widget.el.gz
@@ -3996,8 +4142,6 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/url/url-vars.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/url/url.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/url/url.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/use-package/bind-key.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/use-package/bind-key.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/use-package/use-package-bind-key.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/use-package/use-package-bind-key.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/use-package/use-package-core.el.gz
@@ -4104,12 +4248,16 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/version.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/view.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/view.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/visual-wrap.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/visual-wrap.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/w32-fns.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/w32-fns.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/w32-vars.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/w32-vars.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/wdired.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/wdired.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/which-key.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/which-key.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/whitespace.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/whitespace.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/wid-browse.el.gz
@@ -4120,6 +4268,8 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/widget.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/windmove.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/windmove.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/window-tool-bar.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/window-tool-bar.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/window.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/window.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/winner.el.gz
@@ -4139,9 +4289,23 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/yank-media.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/yank-media.elc
 %%DATADIR%%/%%EMACS_VER%%/site-lisp/subdirs.el
+%%DATADIR%%/info/elisp_type_hierarchy.jpg
+%%DATADIR%%/info/elisp_type_hierarchy.txt
 %%DATADIR%%/site-lisp/subdirs.el
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/site-lisp/site-start.el
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/alloc.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/android-asset.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/android-emacs.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/android.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/android.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/androidfns.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/androidfont.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/androidgui.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/androidmenu.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/androidselect.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/androidterm.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/androidterm.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/androidvfs.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/atimer.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/atimer.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/bidi.c
@@ -4269,6 +4433,7 @@ share/metainfo/emacs.metainfo.xml
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/module-env-27.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/module-env-28.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/module-env-29.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/module-env-30.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/msdos.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/msdos.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/nsgui.h
@@ -4295,6 +4460,11 @@ share/metainfo/emacs.metainfo.xml
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/region-cache.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/scroll.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/search.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sfnt.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sfnt.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sfntfont-android.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sfntfont.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sfntfont.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sheap.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sheap.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sort.c
@@ -4318,6 +4488,8 @@ share/metainfo/emacs.metainfo.xml
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/terminal.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/terminfo.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/termopts.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/textconv.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/textconv.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/textprop.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/thread.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/thread.h