From: Jeremie Courreges-Anglas <jca@wxcvbn.org>
Subject: Re: emacs-30.0.92 pretest
To: ports@openbsd.org
Date: Mon, 25 Nov 2024 23:37:45 +0100

On Mon, Nov 04, 2024 at 12:48:39PM +0100, Jeremie Courreges-Anglas wrote:
> 
> While I don't expect huge changes in emacs 30, here's a diff for you
> folks to test.  The .txt and .jpg in the info/ dir look off, I suspect
> they won't end up in the final emacs-30 release build.
> 
> kill-this-buffer isn't usable directly from keyboard bindings, I had
> to switch to kill-current-buffer instead in my local config.
> 
> Feedback welcome.

So far I only received (positive) feedback from one mysterious emacs user.
Updated diff after the addition of the pgtk FLAVOR, feedback welcome.


Index: Makefile
===================================================================
RCS file: /home/cvs/ports/editors/emacs/Makefile,v
diff -u -p -r1.122 Makefile
--- Makefile	5 Nov 2024 11:16:04 -0000	1.122
+++ Makefile	15 Nov 2024 14:16:44 -0000
@@ -1,10 +1,7 @@
 COMMENT=		GNU editor: extensible, customizable, self-documenting
 
-# XXX 29.4 was released with a .texi file newer than emacs.info
-# Zap post-extract when updating
-VERSION=		29.4
+VERSION=		30.0.92
 DISTNAME=		emacs-${VERSION}
-REVISION=		2
 
 CATEGORIES=		editors
 
@@ -15,10 +12,10 @@ MAINTAINER=		Jeremie Courreges-Anglas <j
 # GPLv3+
 PERMIT_PACKAGE=		Yes
 
-WANTLIB += c curses execinfo gmp gnutls jansson m pthread sqlite3
+WANTLIB += c curses execinfo gmp gnutls m pthread sqlite3
 WANTLIB += tree-sitter xml2 z
 
-SITES=			${SITE_GNU:=emacs/}
+SITES=			https://alpha.gnu.org/gnu/emacs/pretest/
 EXTRACT_SUFX=		.tar.xz
 
 DEBUG_PACKAGES =	${BUILD_PACKAGES}
@@ -45,7 +42,6 @@ SUBST_VARS=		GCCARCH VERSION
 
 USE_GMAKE=		Yes
 LIB_DEPENDS=		databases/sqlite3 \
-			devel/jansson \
 			devel/gmp \
 			security/gnutls \
 			textproc/libxml \
@@ -82,7 +78,7 @@ WANTLIB += ICE SM X11 X11-xcb Xaw3d Xcom
 WANTLIB += Xinerama Xmu Xpm Xrandr Xrender Xt cairo dbus-1 fontconfig
 WANTLIB += freetype gdk_pixbuf-2.0 gif gio-2.0 glib-2.0 gobject-2.0
 WANTLIB += harfbuzz intl jpeg lcms2 m17n-core m17n-flt otf png
-WANTLIB += rsvg-2 tiff webpdecoder webpdemux xcb xcb-shape xcb-util
+WANTLIB += rsvg-2 tiff webpdecoder webpdemux xcb xcb-shape
 . elif ${FLAVOR} == "gtk2"
 CONFIGURE_ARGS+=	--with-x-toolkit=gtk2
 LIB_DEPENDS+=		x11/gtk+2
@@ -93,7 +89,7 @@ WANTLIB += dbus-1 fontconfig freetype gd
 WANTLIB += gif gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0 harfbuzz
 WANTLIB += intl jpeg lcms2 m17n-core m17n-flt otf pango-1.0 pangocairo-1.0
 WANTLIB += pangoft2-1.0 png rsvg-2 tiff webpdecoder webpdemux
-WANTLIB += xcb xcb-shape xcb-util
+WANTLIB += xcb xcb-shape
 . elif ${FLAVOR} == "gtk3"
 CONFIGURE_ARGS+=	--with-x-toolkit=gtk3
 LIB_DEPENDS+=		x11/gtk+3
@@ -103,7 +99,7 @@ WANTLIB += Xpm Xrandr Xrender atk-1.0 ca
 WANTLIB += fontconfig freetype gdk-3 gdk_pixbuf-2.0 gif gio-2.0
 WANTLIB += glib-2.0 gobject-2.0 gtk-3 harfbuzz intl jpeg lcms2
 WANTLIB += m17n-core m17n-flt otf pango-1.0 pangocairo-1.0 png
-WANTLIB += rsvg-2 tiff webpdecoder webpdemux xcb xcb-shape xcb-util
+WANTLIB += rsvg-2 tiff webpdecoder webpdemux xcb xcb-shape
 . elif ${FLAVOR} == "pgtk"
 CONFIGURE_ARGS+=	--with-pgtk
 LIB_DEPENDS+=		x11/gtk+3
@@ -117,7 +113,9 @@ ERRORS+=		"Fatal: Conflicting flavor: ${
 .endif
 
 post-extract:
-	touch ${WRKSRC}/info/emacs.info
+	# XXX workaround to avoid needlessly rebuild elisp.info
+	cp ${WRKSRC}/doc/lispref/elisp_type_hierarchy.* ${WRKBUILD}/info
+	touch ${WRKBUILD}/info/elisp.info
 
 post-install:
 	chmod -t ${PREFIX}/bin/emacs-${VERSION}
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/editors/emacs/distinfo,v
diff -u -p -r1.21 distinfo
--- distinfo	23 Jun 2024 12:55:50 -0000	1.21
+++ distinfo	4 Nov 2024 17:59:15 -0000
@@ -1,2 +1,2 @@
-SHA256 (emacs-29.4.tar.xz) = uol5RvlMNmAKfnuzUB0nqkES15G/4URcYe0oVQ2sojU=
-SIZE (emacs-29.4.tar.xz) = 52210344
+SHA256 (emacs-30.0.92.tar.xz) = 2JKHvVqDgbtg4UqrlSAjdyYdQ6YNFdwKYdDWYrxWJr4=
+SIZE (emacs-30.0.92.tar.xz) = 54813380
Index: patches/patch-Makefile_in
===================================================================
RCS file: /home/cvs/ports/editors/emacs/patches/patch-Makefile_in,v
diff -u -p -r1.9 patch-Makefile_in
--- patches/patch-Makefile_in	2 Aug 2023 11:12:25 -0000	1.9
+++ patches/patch-Makefile_in	4 Nov 2024 17:59:15 -0000
@@ -3,7 +3,7 @@
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -792,7 +792,7 @@ install-info: info
+@@ -806,7 +806,7 @@ install-info: info
  	      for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
  	       (cd "$${thisdir}"; \
  	        ${INSTALL_DATA} ${srcdir}/info/$$f "$(DESTDIR)${infodir}/$$f"); \
@@ -12,7 +12,7 @@ Index: Makefile.in
  	        rm -f "$(DESTDIR)${infodir}/$$f.gz"; \
  	        ${GZIP_PROG} -9n "$(DESTDIR)${infodir}/$$f"; \
  	      done; \
-@@ -816,7 +816,7 @@ install-man:
+@@ -831,7 +831,7 @@ install-man:
  	  dest=`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1; \
  	  (cd "$${thisdir}"; \
  	   ${INSTALL_DATA} ${mansrcdir}/$${page} "$(DESTDIR)${man1dir}/$${dest}"); \
Index: patches/patch-lisp_files_el
===================================================================
RCS file: /home/cvs/ports/editors/emacs/patches/patch-lisp_files_el,v
diff -u -p -r1.10 patch-lisp_files_el
--- patches/patch-lisp_files_el	24 Mar 2024 16:36:34 -0000	1.10
+++ patches/patch-lisp_files_el	4 Nov 2024 17:59:15 -0000
@@ -3,7 +3,7 @@
 Index: lisp/files.el
 --- lisp/files.el.orig
 +++ lisp/files.el
-@@ -3000,6 +3000,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|CB
+@@ -3091,6 +3091,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|CB
       ("\\.\\(as\\|mi\\|sm\\)2\\'" . snmpv2-mode)
       ("\\.\\(diffs?\\|patch\\|rej\\)\\'" . diff-mode)
       ("\\.\\(dif\\|pat\\)\\'" . diff-mode) ; for MS-DOS
Index: patches/patch-lisp_vc_vc_el
===================================================================
RCS file: /home/cvs/ports/editors/emacs/patches/patch-lisp_vc_vc_el,v
diff -u -p -r1.10 patch-lisp_vc_vc_el
--- patches/patch-lisp_vc_vc_el	24 Mar 2024 16:36:34 -0000	1.10
+++ patches/patch-lisp_vc_vc_el	4 Nov 2024 17:59:15 -0000
@@ -3,7 +3,7 @@ Drop messages that slow down VC with big
 Index: lisp/vc/vc.el
 --- lisp/vc/vc.el.orig
 +++ lisp/vc/vc.el
-@@ -3721,13 +3721,11 @@ It returns the last revision that changed LINE number 
+@@ -3849,13 +3849,11 @@ It returns the last revision that changed LINE number 
  (defun vc-file-tree-walk (dirname func &rest args)
    "Walk recursively through DIRNAME.
  Invoke FUNC f ARGS on each VC-managed file f underneath it."
Index: patches/patch-src_emacs_c
===================================================================
RCS file: /home/cvs/ports/editors/emacs/patches/patch-src_emacs_c,v
diff -u -p -r1.6 patch-src_emacs_c
--- patches/patch-src_emacs_c	20 Jan 2024 22:43:39 -0000	1.6
+++ patches/patch-src_emacs_c	4 Nov 2024 17:59:15 -0000
@@ -1,37 +0,0 @@
-Don't use printf %n.
-
-Index: src/emacs.c
---- src/emacs.c.orig
-+++ src/emacs.c
-@@ -2950,25 +2950,17 @@ shut_down_emacs (int sig, Lisp_Object stuff)
-       reset_all_sys_modes ();
-       if (sig && sig != SIGTERM)
- 	{
--	  static char const fmt[] = "Fatal error %d: %n%s\n";
-+	  static char const fmt[] = "Fatal error %d: ";
- #ifdef HAVE_HAIKU
- 	  if (haiku_debug_on_fatal_error)
- 	    debugger ("Fatal error in Emacs");
- #endif
--	  char buf[max ((sizeof fmt - sizeof "%d%n%s\n"
--			 + INT_STRLEN_BOUND (int) + 1),
--			min (PIPE_BUF, MAX_ALLOCA))];
-+	  char buf[sizeof fmt - strlen ("%d") + INT_STRLEN_BOUND (int) + 1];
- 	  char const *sig_desc = safe_strsignal (sig);
--	  int nlen;
--	  int buflen = snprintf (buf, sizeof buf, fmt, sig, &nlen, sig_desc);
--	  if (0 <= buflen && buflen < sizeof buf)
--	    emacs_write (STDERR_FILENO, buf, buflen);
--	  else
--	    {
--	      emacs_write (STDERR_FILENO, buf, nlen);
--	      emacs_write (STDERR_FILENO, sig_desc, strlen (sig_desc));
--	      emacs_write (STDERR_FILENO, fmt + sizeof fmt - 2, 1);
--	    }
-+	  snprintf (buf, sizeof buf, fmt, sig);
-+	  emacs_write (STDERR_FILENO, buf, strlen (buf));
-+	  emacs_write (STDERR_FILENO, sig_desc, strlen (sig_desc));
-+	  emacs_write (STDERR_FILENO, "\n", 1);
- 	}
-     }
- #else
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/editors/emacs/pkg/PLIST,v
diff -u -p -r1.32 PLIST
--- pkg/PLIST	5 Nov 2024 11:16:04 -0000	1.32
+++ pkg/PLIST	15 Nov 2024 14:10:00 -0000
@@ -35,6 +35,8 @@ include/emacs-module.h
 @info info/eieio.info
 @info info/eintr.info
 @info info/elisp.info
+info/elisp_type_hierarchy.jpg
+info/elisp_type_hierarchy.txt
 @info info/emacs-gnutls.info
 @info info/emacs-mime.info
 @info info/emacs.info
@@ -132,6 +134,8 @@ share/emacs/${VERSION}/etc/NEWS.25
 share/emacs/${VERSION}/etc/NEWS.26
 share/emacs/${VERSION}/etc/NEWS.27
 share/emacs/${VERSION}/etc/NEWS.28
+share/emacs/${VERSION}/etc/NEWS.29
+share/emacs/${VERSION}/etc/NEWS.unknown
 share/emacs/${VERSION}/etc/NEXTSTEP
 share/emacs/${VERSION}/etc/NXML-NEWS
 share/emacs/${VERSION}/etc/ORG-NEWS
@@ -273,6 +277,7 @@ share/emacs/${VERSION}/etc/charsets/VSCI
 share/emacs/${VERSION}/etc/charsets/stdenc.map
 share/emacs/${VERSION}/etc/charsets/symbol.map
 share/emacs/${VERSION}/etc/compilation.txt
+share/emacs/${VERSION}/etc/copyright-assign.txt
 share/emacs/${VERSION}/etc/e/
 share/emacs/${VERSION}/etc/e/README
 share/emacs/${VERSION}/etc/e/eterm-color
@@ -302,6 +307,7 @@ share/emacs/${VERSION}/etc/gnus/news-ser
 share/emacs/${VERSION}/etc/grep.txt
 share/emacs/${VERSION}/etc/images/
 share/emacs/${VERSION}/etc/images/README
+share/emacs/${VERSION}/etc/images/alt.pbm
 share/emacs/${VERSION}/etc/images/attach.pbm
 share/emacs/${VERSION}/etc/images/attach.xpm
 share/emacs/${VERSION}/etc/images/back-arrow.pbm
@@ -315,6 +321,10 @@ share/emacs/${VERSION}/etc/images/checke
 share/emacs/${VERSION}/etc/images/checked.xpm
 share/emacs/${VERSION}/etc/images/close.pbm
 share/emacs/${VERSION}/etc/images/close.xpm
+share/emacs/${VERSION}/etc/images/commit.pbm
+share/emacs/${VERSION}/etc/images/commit.xpm
+share/emacs/${VERSION}/etc/images/conceal.pbm
+share/emacs/${VERSION}/etc/images/conceal.svg
 share/emacs/${VERSION}/etc/images/connect-to-url.pbm
 share/emacs/${VERSION}/etc/images/connect-to-url.xpm
 share/emacs/${VERSION}/etc/images/connect.pbm
@@ -323,6 +333,7 @@ share/emacs/${VERSION}/etc/images/contac
 share/emacs/${VERSION}/etc/images/contact.xpm
 share/emacs/${VERSION}/etc/images/copy.pbm
 share/emacs/${VERSION}/etc/images/copy.xpm
+share/emacs/${VERSION}/etc/images/ctrl.pbm
 share/emacs/${VERSION}/etc/images/custom/
 share/emacs/${VERSION}/etc/images/custom/README
 share/emacs/${VERSION}/etc/images/custom/down-pushed.pbm
@@ -406,6 +417,8 @@ share/emacs/${VERSION}/etc/images/ezimag
 share/emacs/${VERSION}/etc/images/ezimage/unlock.xpm
 share/emacs/${VERSION}/etc/images/fwd-arrow.pbm
 share/emacs/${VERSION}/etc/images/fwd-arrow.xpm
+share/emacs/${VERSION}/etc/images/gen-changelog.pbm
+share/emacs/${VERSION}/etc/images/gen-changelog.xpm
 share/emacs/${VERSION}/etc/images/gnus/
 share/emacs/${VERSION}/etc/images/gnus.pbm
 share/emacs/${VERSION}/etc/images/gnus/README
@@ -413,6 +426,7 @@ share/emacs/${VERSION}/etc/images/gnus/f
 share/emacs/${VERSION}/etc/images/gnus/followup.xpm
 share/emacs/${VERSION}/etc/images/gnus/fuwo.pbm
 share/emacs/${VERSION}/etc/images/gnus/fuwo.xpm
+share/emacs/${VERSION}/etc/images/gnus/gnus-pointer.svg
 share/emacs/${VERSION}/etc/images/gnus/gnus-pointer.xbm
 share/emacs/${VERSION}/etc/images/gnus/gnus-pointer.xpm
 share/emacs/${VERSION}/etc/images/gnus/gnus.png
@@ -491,6 +505,7 @@ share/emacs/${VERSION}/etc/images/help.p
 share/emacs/${VERSION}/etc/images/help.xpm
 share/emacs/${VERSION}/etc/images/home.pbm
 share/emacs/${VERSION}/etc/images/home.xpm
+share/emacs/${VERSION}/etc/images/hyper.pbm
 share/emacs/${VERSION}/etc/images/icons/
 share/emacs/${VERSION}/etc/images/icons/README
 share/emacs/${VERSION}/etc/images/icons/allout-widgets/
@@ -577,13 +592,19 @@ share/emacs/${VERSION}/etc/images/index.
 share/emacs/${VERSION}/etc/images/index.xpm
 share/emacs/${VERSION}/etc/images/info.pbm
 share/emacs/${VERSION}/etc/images/info.xpm
+share/emacs/${VERSION}/etc/images/ins-changelog.pbm
+share/emacs/${VERSION}/etc/images/ins-changelog.xpm
 share/emacs/${VERSION}/etc/images/jump-to.pbm
 share/emacs/${VERSION}/etc/images/jump-to.xpm
+share/emacs/${VERSION}/etc/images/last-page.pbm
+share/emacs/${VERSION}/etc/images/last-page.xpm
 share/emacs/${VERSION}/etc/images/left-arrow.pbm
 share/emacs/${VERSION}/etc/images/left-arrow.xpm
 share/emacs/${VERSION}/etc/images/left.svg
 share/emacs/${VERSION}/etc/images/letter.pbm
 share/emacs/${VERSION}/etc/images/letter.xpm
+share/emacs/${VERSION}/etc/images/load-changelog.pbm
+share/emacs/${VERSION}/etc/images/load-changelog.xpm
 share/emacs/${VERSION}/etc/images/lock-broken.pbm
 share/emacs/${VERSION}/etc/images/lock-broken.xpm
 share/emacs/${VERSION}/etc/images/lock-ok.pbm
@@ -652,6 +673,7 @@ share/emacs/${VERSION}/etc/images/mail/s
 share/emacs/${VERSION}/etc/images/mail/send.pbm
 share/emacs/${VERSION}/etc/images/mail/send.xpm
 share/emacs/${VERSION}/etc/images/mail/spam.xpm
+share/emacs/${VERSION}/etc/images/meta.pbm
 share/emacs/${VERSION}/etc/images/mh-logo.pbm
 share/emacs/${VERSION}/etc/images/mh-logo.xpm
 share/emacs/${VERSION}/etc/images/mpc/
@@ -713,6 +735,8 @@ share/emacs/${VERSION}/etc/images/redo.p
 share/emacs/${VERSION}/etc/images/redo.xpm
 share/emacs/${VERSION}/etc/images/refresh.pbm
 share/emacs/${VERSION}/etc/images/refresh.xpm
+share/emacs/${VERSION}/etc/images/reveal.pbm
+share/emacs/${VERSION}/etc/images/reveal.svg
 share/emacs/${VERSION}/etc/images/right-arrow.pbm
 share/emacs/${VERSION}/etc/images/right-arrow.xpm
 share/emacs/${VERSION}/etc/images/right.svg
@@ -726,6 +750,7 @@ share/emacs/${VERSION}/etc/images/search
 share/emacs/${VERSION}/etc/images/search.xpm
 share/emacs/${VERSION}/etc/images/separator.pbm
 share/emacs/${VERSION}/etc/images/separator.xpm
+share/emacs/${VERSION}/etc/images/shift.pbm
 share/emacs/${VERSION}/etc/images/show.pbm
 share/emacs/${VERSION}/etc/images/show.xpm
 share/emacs/${VERSION}/etc/images/smilies/
@@ -801,6 +826,57 @@ share/emacs/${VERSION}/etc/images/splash
 share/emacs/${VERSION}/etc/images/splash.png
 share/emacs/${VERSION}/etc/images/splash.svg
 share/emacs/${VERSION}/etc/images/splash.xpm
+share/emacs/${VERSION}/etc/images/super.pbm
+share/emacs/${VERSION}/etc/images/symbols/
+share/emacs/${VERSION}/etc/images/symbols/README
+share/emacs/${VERSION}/etc/images/symbols/check-mark_16.pbm
+share/emacs/${VERSION}/etc/images/symbols/check-mark_16.svg
+share/emacs/${VERSION}/etc/images/symbols/chevron_down_16.pbm
+share/emacs/${VERSION}/etc/images/symbols/chevron_down_16.svg
+share/emacs/${VERSION}/etc/images/symbols/chevron_left_16.pbm
+share/emacs/${VERSION}/etc/images/symbols/chevron_left_16.svg
+share/emacs/${VERSION}/etc/images/symbols/chevron_right_16.pbm
+share/emacs/${VERSION}/etc/images/symbols/chevron_right_16.svg
+share/emacs/${VERSION}/etc/images/symbols/chevron_up_16.pbm
+share/emacs/${VERSION}/etc/images/symbols/chevron_up_16.svg
+share/emacs/${VERSION}/etc/images/symbols/cross_16.pbm
+share/emacs/${VERSION}/etc/images/symbols/cross_16.svg
+share/emacs/${VERSION}/etc/images/symbols/cross_circle_16.pbm
+share/emacs/${VERSION}/etc/images/symbols/cross_circle_16.svg
+share/emacs/${VERSION}/etc/images/symbols/cross_circle_fill_16.pbm
+share/emacs/${VERSION}/etc/images/symbols/cross_circle_fill_16.svg
+share/emacs/${VERSION}/etc/images/symbols/dot_large_16.pbm
+share/emacs/${VERSION}/etc/images/symbols/dot_large_16.svg
+share/emacs/${VERSION}/etc/images/symbols/dot_medium_16.pbm
+share/emacs/${VERSION}/etc/images/symbols/dot_medium_16.svg
+share/emacs/${VERSION}/etc/images/symbols/dot_small_16.pbm
+share/emacs/${VERSION}/etc/images/symbols/dot_small_16.svg
+share/emacs/${VERSION}/etc/images/symbols/heart_16.pbm
+share/emacs/${VERSION}/etc/images/symbols/heart_16.svg
+share/emacs/${VERSION}/etc/images/symbols/heart_fill_16.pbm
+share/emacs/${VERSION}/etc/images/symbols/heart_fill_16.svg
+share/emacs/${VERSION}/etc/images/symbols/heart_half_16.pbm
+share/emacs/${VERSION}/etc/images/symbols/heart_half_16.svg
+share/emacs/${VERSION}/etc/images/symbols/menu_16.pbm
+share/emacs/${VERSION}/etc/images/symbols/menu_16.svg
+share/emacs/${VERSION}/etc/images/symbols/minus_16.pbm
+share/emacs/${VERSION}/etc/images/symbols/minus_16.svg
+share/emacs/${VERSION}/etc/images/symbols/minus_circle_16.pbm
+share/emacs/${VERSION}/etc/images/symbols/minus_circle_16.svg
+share/emacs/${VERSION}/etc/images/symbols/minus_circle_fill_16.pbm
+share/emacs/${VERSION}/etc/images/symbols/minus_circle_fill_16.svg
+share/emacs/${VERSION}/etc/images/symbols/plus_16.pbm
+share/emacs/${VERSION}/etc/images/symbols/plus_16.svg
+share/emacs/${VERSION}/etc/images/symbols/plus_circle_16.pbm
+share/emacs/${VERSION}/etc/images/symbols/plus_circle_16.svg
+share/emacs/${VERSION}/etc/images/symbols/plus_circle_fill_16.pbm
+share/emacs/${VERSION}/etc/images/symbols/plus_circle_fill_16.svg
+share/emacs/${VERSION}/etc/images/symbols/star_16.pbm
+share/emacs/${VERSION}/etc/images/symbols/star_16.svg
+share/emacs/${VERSION}/etc/images/symbols/star_fill_16.pbm
+share/emacs/${VERSION}/etc/images/symbols/star_fill_16.svg
+share/emacs/${VERSION}/etc/images/symbols/star_half_16.pbm
+share/emacs/${VERSION}/etc/images/symbols/star_half_16.svg
 share/emacs/${VERSION}/etc/images/tabs/
 share/emacs/${VERSION}/etc/images/tabs/README
 share/emacs/${VERSION}/etc/images/tabs/close.xpm
@@ -862,6 +938,8 @@ share/emacs/${VERSION}/etc/images/up-arr
 share/emacs/${VERSION}/etc/images/up-node.pbm
 share/emacs/${VERSION}/etc/images/up-node.xpm
 share/emacs/${VERSION}/etc/images/up.svg
+share/emacs/${VERSION}/etc/images/view-diff.pbm
+share/emacs/${VERSION}/etc/images/view-diff.xpm
 share/emacs/${VERSION}/etc/images/zoom-in.pbm
 share/emacs/${VERSION}/etc/images/zoom-in.xpm
 share/emacs/${VERSION}/etc/images/zoom-out.pbm
@@ -945,7 +1023,14 @@ share/emacs/${VERSION}/etc/schema/dbnotn
 share/emacs/${VERSION}/etc/schema/dbpool.rnc
 share/emacs/${VERSION}/etc/schema/dbstart.rnc
 share/emacs/${VERSION}/etc/schema/docbook.rnc
+share/emacs/${VERSION}/etc/schema/dotnet-appconfig.rnc
+share/emacs/${VERSION}/etc/schema/dotnet-packages-config.rnc
+share/emacs/${VERSION}/etc/schema/dotnet-packages-props.rnc
+share/emacs/${VERSION}/etc/schema/dotnet-resx.rnc
 share/emacs/${VERSION}/etc/schema/locate.rnc
+share/emacs/${VERSION}/etc/schema/msbuild.rnc
+share/emacs/${VERSION}/etc/schema/nuget.rnc
+share/emacs/${VERSION}/etc/schema/nuspec.rnc
 share/emacs/${VERSION}/etc/schema/od-manifest-schema-v1.2-os.rnc
 share/emacs/${VERSION}/etc/schema/rdfxml.rnc
 share/emacs/${VERSION}/etc/schema/relaxng.rnc
@@ -1013,9 +1098,15 @@ share/emacs/${VERSION}/etc/themes/leuven
 share/emacs/${VERSION}/etc/themes/light-blue-theme.el
 share/emacs/${VERSION}/etc/themes/manoj-dark-theme.el
 share/emacs/${VERSION}/etc/themes/misterioso-theme.el
+share/emacs/${VERSION}/etc/themes/modus-operandi-deuteranopia-theme.el
 share/emacs/${VERSION}/etc/themes/modus-operandi-theme.el
+share/emacs/${VERSION}/etc/themes/modus-operandi-tinted-theme.el
+share/emacs/${VERSION}/etc/themes/modus-operandi-tritanopia-theme.el
 share/emacs/${VERSION}/etc/themes/modus-themes.el
+share/emacs/${VERSION}/etc/themes/modus-vivendi-deuteranopia-theme.el
 share/emacs/${VERSION}/etc/themes/modus-vivendi-theme.el
+share/emacs/${VERSION}/etc/themes/modus-vivendi-tinted-theme.el
+share/emacs/${VERSION}/etc/themes/modus-vivendi-tritanopia-theme.el
 share/emacs/${VERSION}/etc/themes/tango-dark-theme.el
 share/emacs/${VERSION}/etc/themes/tango-theme.el
 share/emacs/${VERSION}/etc/themes/tsdh-dark-theme.el
@@ -1085,6 +1176,8 @@ share/emacs/${VERSION}/lisp/avoid.el.gz
 share/emacs/${VERSION}/lisp/avoid.elc
 share/emacs/${VERSION}/lisp/battery.el.gz
 share/emacs/${VERSION}/lisp/battery.elc
+share/emacs/${VERSION}/lisp/bind-key.el.gz
+share/emacs/${VERSION}/lisp/bind-key.elc
 share/emacs/${VERSION}/lisp/bindings.el.gz
 share/emacs/${VERSION}/lisp/bindings.elc
 share/emacs/${VERSION}/lisp/bookmark.el.gz
@@ -1582,6 +1675,8 @@ share/emacs/${VERSION}/lisp/color.el.gz
 share/emacs/${VERSION}/lisp/color.elc
 share/emacs/${VERSION}/lisp/comint.el.gz
 share/emacs/${VERSION}/lisp/comint.elc
+share/emacs/${VERSION}/lisp/completion-preview.el.gz
+share/emacs/${VERSION}/lisp/completion-preview.elc
 share/emacs/${VERSION}/lisp/completion.el.gz
 share/emacs/${VERSION}/lisp/completion.elc
 share/emacs/${VERSION}/lisp/composite.el.gz
@@ -1649,6 +1744,18 @@ share/emacs/${VERSION}/lisp/echistory.el
 share/emacs/${VERSION}/lisp/echistory.elc
 share/emacs/${VERSION}/lisp/ecomplete.el.gz
 share/emacs/${VERSION}/lisp/ecomplete.elc
+share/emacs/${VERSION}/lisp/editorconfig-conf-mode.el.gz
+share/emacs/${VERSION}/lisp/editorconfig-conf-mode.elc
+share/emacs/${VERSION}/lisp/editorconfig-core-handle.el.gz
+share/emacs/${VERSION}/lisp/editorconfig-core-handle.elc
+share/emacs/${VERSION}/lisp/editorconfig-core.el.gz
+share/emacs/${VERSION}/lisp/editorconfig-core.elc
+share/emacs/${VERSION}/lisp/editorconfig-fnmatch.el.gz
+share/emacs/${VERSION}/lisp/editorconfig-fnmatch.elc
+share/emacs/${VERSION}/lisp/editorconfig-tools.el.gz
+share/emacs/${VERSION}/lisp/editorconfig-tools.elc
+share/emacs/${VERSION}/lisp/editorconfig.el.gz
+share/emacs/${VERSION}/lisp/editorconfig.elc
 share/emacs/${VERSION}/lisp/edmacro.el.gz
 share/emacs/${VERSION}/lisp/edmacro.elc
 share/emacs/${VERSION}/lisp/ehelp.el.gz
@@ -1704,10 +1811,16 @@ share/emacs/${VERSION}/lisp/emacs-lisp/c
 share/emacs/${VERSION}/lisp/emacs-lisp/cl-print.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/cl-seq.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/cl-seq.elc
+share/emacs/${VERSION}/lisp/emacs-lisp/comp-common.el.gz
+share/emacs/${VERSION}/lisp/emacs-lisp/comp-common.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/comp-cstr.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/comp-cstr.elc
+share/emacs/${VERSION}/lisp/emacs-lisp/comp-run.el.gz
+share/emacs/${VERSION}/lisp/emacs-lisp/comp-run.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/comp.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/comp.elc
+share/emacs/${VERSION}/lisp/emacs-lisp/compat.el.gz
+share/emacs/${VERSION}/lisp/emacs-lisp/compat.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/copyright.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/copyright.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/crm.el.gz
@@ -1748,6 +1861,8 @@ share/emacs/${VERSION}/lisp/emacs-lisp/e
 share/emacs/${VERSION}/lisp/emacs-lisp/elint.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/elp.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/elp.elc
+share/emacs/${VERSION}/lisp/emacs-lisp/ert-font-lock.el.gz
+share/emacs/${VERSION}/lisp/emacs-lisp/ert-font-lock.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/ert-x.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/ert-x.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/ert.el.gz
@@ -1858,6 +1973,8 @@ share/emacs/${VERSION}/lisp/emacs-lisp/t
 share/emacs/${VERSION}/lisp/emacs-lisp/tq.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/trace.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/trace.elc
+share/emacs/${VERSION}/lisp/emacs-lisp/track-changes.el.gz
+share/emacs/${VERSION}/lisp/emacs-lisp/track-changes.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/unsafep.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/unsafep.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/vtable.el.gz
@@ -1966,6 +2083,8 @@ share/emacs/${VERSION}/lisp/erc/erc-nets
 share/emacs/${VERSION}/lisp/erc/erc-netsplit.elc
 share/emacs/${VERSION}/lisp/erc/erc-networks.el.gz
 share/emacs/${VERSION}/lisp/erc/erc-networks.elc
+share/emacs/${VERSION}/lisp/erc/erc-nicks.el.gz
+share/emacs/${VERSION}/lisp/erc/erc-nicks.elc
 share/emacs/${VERSION}/lisp/erc/erc-notify.el.gz
 share/emacs/${VERSION}/lisp/erc/erc-notify.elc
 share/emacs/${VERSION}/lisp/erc/erc-page.el.gz
@@ -2043,12 +2162,12 @@ share/emacs/${VERSION}/lisp/eshell/esh-c
 share/emacs/${VERSION}/lisp/eshell/esh-cmd.elc
 share/emacs/${VERSION}/lisp/eshell/esh-ext.el.gz
 share/emacs/${VERSION}/lisp/eshell/esh-ext.elc
-share/emacs/${VERSION}/lisp/eshell/esh-groups.el.gz
-share/emacs/${VERSION}/lisp/eshell/esh-groups.elc
 share/emacs/${VERSION}/lisp/eshell/esh-io.el.gz
 share/emacs/${VERSION}/lisp/eshell/esh-io.elc
 share/emacs/${VERSION}/lisp/eshell/esh-mode.el.gz
 share/emacs/${VERSION}/lisp/eshell/esh-mode.elc
+share/emacs/${VERSION}/lisp/eshell/esh-module-loaddefs.el.gz
+share/emacs/${VERSION}/lisp/eshell/esh-module-loaddefs.elc
 share/emacs/${VERSION}/lisp/eshell/esh-module.el.gz
 share/emacs/${VERSION}/lisp/eshell/esh-module.elc
 share/emacs/${VERSION}/lisp/eshell/esh-opt.el.gz
@@ -2231,8 +2350,6 @@ share/emacs/${VERSION}/lisp/gnus/gnus.el
 share/emacs/${VERSION}/lisp/gnus/gnus.elc
 share/emacs/${VERSION}/lisp/gnus/gssapi.el.gz
 share/emacs/${VERSION}/lisp/gnus/gssapi.elc
-share/emacs/${VERSION}/lisp/gnus/legacy-gnus-agent.el.gz
-share/emacs/${VERSION}/lisp/gnus/legacy-gnus-agent.elc
 share/emacs/${VERSION}/lisp/gnus/mail-source.el.gz
 share/emacs/${VERSION}/lisp/gnus/mail-source.elc
 share/emacs/${VERSION}/lisp/gnus/message.el.gz
@@ -2269,6 +2386,8 @@ share/emacs/${VERSION}/lisp/gnus/mml2015
 share/emacs/${VERSION}/lisp/gnus/mml2015.elc
 share/emacs/${VERSION}/lisp/gnus/nnagent.el.gz
 share/emacs/${VERSION}/lisp/gnus/nnagent.elc
+share/emacs/${VERSION}/lisp/gnus/nnatom.el.gz
+share/emacs/${VERSION}/lisp/gnus/nnatom.elc
 share/emacs/${VERSION}/lisp/gnus/nnbabyl.el.gz
 share/emacs/${VERSION}/lisp/gnus/nnbabyl.elc
 share/emacs/${VERSION}/lisp/gnus/nndiary.el.gz
@@ -2281,6 +2400,8 @@ share/emacs/${VERSION}/lisp/gnus/nndraft
 share/emacs/${VERSION}/lisp/gnus/nndraft.elc
 share/emacs/${VERSION}/lisp/gnus/nneething.el.gz
 share/emacs/${VERSION}/lisp/gnus/nneething.elc
+share/emacs/${VERSION}/lisp/gnus/nnfeed.el.gz
+share/emacs/${VERSION}/lisp/gnus/nnfeed.elc
 share/emacs/${VERSION}/lisp/gnus/nnfolder.el.gz
 share/emacs/${VERSION}/lisp/gnus/nnfolder.elc
 share/emacs/${VERSION}/lisp/gnus/nngateway.el.gz
@@ -2406,6 +2527,8 @@ share/emacs/${VERSION}/lisp/image/wallpa
 share/emacs/${VERSION}/lisp/image/wallpaper.elc
 share/emacs/${VERSION}/lisp/imenu.el.gz
 share/emacs/${VERSION}/lisp/imenu.elc
+share/emacs/${VERSION}/lisp/indent-aux.el.gz
+share/emacs/${VERSION}/lisp/indent-aux.elc
 share/emacs/${VERSION}/lisp/indent.el.gz
 share/emacs/${VERSION}/lisp/indent.elc
 share/emacs/${VERSION}/lisp/info-look.el.gz
@@ -2706,6 +2829,8 @@ share/emacs/${VERSION}/lisp/leim/quail/l
 share/emacs/${VERSION}/lisp/leim/quail/lrt.elc
 share/emacs/${VERSION}/lisp/leim/quail/misc-lang.el.gz
 share/emacs/${VERSION}/lisp/leim/quail/misc-lang.elc
+share/emacs/${VERSION}/lisp/leim/quail/pakistan.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/pakistan.elc
 share/emacs/${VERSION}/lisp/leim/quail/persian.el.gz
 share/emacs/${VERSION}/lisp/leim/quail/persian.elc
 share/emacs/${VERSION}/lisp/leim/quail/philippine.el.gz
@@ -3053,6 +3178,8 @@ share/emacs/${VERSION}/lisp/net/telnet.e
 share/emacs/${VERSION}/lisp/net/telnet.elc
 share/emacs/${VERSION}/lisp/net/tramp-adb.el.gz
 share/emacs/${VERSION}/lisp/net/tramp-adb.elc
+share/emacs/${VERSION}/lisp/net/tramp-androidsu.el.gz
+share/emacs/${VERSION}/lisp/net/tramp-androidsu.elc
 share/emacs/${VERSION}/lisp/net/tramp-archive.el.gz
 share/emacs/${VERSION}/lisp/net/tramp-archive.elc
 share/emacs/${VERSION}/lisp/net/tramp-cache.el.gz
@@ -3075,6 +3202,8 @@ share/emacs/${VERSION}/lisp/net/tramp-in
 share/emacs/${VERSION}/lisp/net/tramp-integration.elc
 share/emacs/${VERSION}/lisp/net/tramp-loaddefs.el.gz
 share/emacs/${VERSION}/lisp/net/tramp-loaddefs.elc
+share/emacs/${VERSION}/lisp/net/tramp-message.el.gz
+share/emacs/${VERSION}/lisp/net/tramp-message.elc
 share/emacs/${VERSION}/lisp/net/tramp-rclone.el.gz
 share/emacs/${VERSION}/lisp/net/tramp-rclone.elc
 share/emacs/${VERSION}/lisp/net/tramp-sh.el.gz
@@ -3431,6 +3560,8 @@ share/emacs/${VERSION}/lisp/org/org-date
 share/emacs/${VERSION}/lisp/org/org-datetree.elc
 share/emacs/${VERSION}/lisp/org/org-duration.el.gz
 share/emacs/${VERSION}/lisp/org/org-duration.elc
+share/emacs/${VERSION}/lisp/org/org-element-ast.el.gz
+share/emacs/${VERSION}/lisp/org/org-element-ast.elc
 share/emacs/${VERSION}/lisp/org/org-element.el.gz
 share/emacs/${VERSION}/lisp/org/org-element.elc
 share/emacs/${VERSION}/lisp/org/org-entities.el.gz
@@ -3690,8 +3821,12 @@ share/emacs/${VERSION}/lisp/progmodes/eg
 share/emacs/${VERSION}/lisp/progmodes/eglot.elc
 share/emacs/${VERSION}/lisp/progmodes/elisp-mode.el.gz
 share/emacs/${VERSION}/lisp/progmodes/elisp-mode.elc
+share/emacs/${VERSION}/lisp/progmodes/elixir-ts-mode.el.gz
+share/emacs/${VERSION}/lisp/progmodes/elixir-ts-mode.elc
 share/emacs/${VERSION}/lisp/progmodes/erts-mode.el.gz
 share/emacs/${VERSION}/lisp/progmodes/erts-mode.elc
+share/emacs/${VERSION}/lisp/progmodes/etags-regen.el.gz
+share/emacs/${VERSION}/lisp/progmodes/etags-regen.elc
 share/emacs/${VERSION}/lisp/progmodes/etags.el.gz
 share/emacs/${VERSION}/lisp/progmodes/etags.elc
 share/emacs/${VERSION}/lisp/progmodes/executable.el.gz
@@ -3716,6 +3851,8 @@ share/emacs/${VERSION}/lisp/progmodes/gr
 share/emacs/${VERSION}/lisp/progmodes/grep.elc
 share/emacs/${VERSION}/lisp/progmodes/gud.el.gz
 share/emacs/${VERSION}/lisp/progmodes/gud.elc
+share/emacs/${VERSION}/lisp/progmodes/heex-ts-mode.el.gz
+share/emacs/${VERSION}/lisp/progmodes/heex-ts-mode.elc
 share/emacs/${VERSION}/lisp/progmodes/hideif.el.gz
 share/emacs/${VERSION}/lisp/progmodes/hideif.elc
 share/emacs/${VERSION}/lisp/progmodes/hideshow.el.gz
@@ -3742,6 +3879,8 @@ share/emacs/${VERSION}/lisp/progmodes/js
 share/emacs/${VERSION}/lisp/progmodes/json-ts-mode.elc
 share/emacs/${VERSION}/lisp/progmodes/ld-script.el.gz
 share/emacs/${VERSION}/lisp/progmodes/ld-script.elc
+share/emacs/${VERSION}/lisp/progmodes/lua-ts-mode.el.gz
+share/emacs/${VERSION}/lisp/progmodes/lua-ts-mode.elc
 share/emacs/${VERSION}/lisp/progmodes/m4-mode.el.gz
 share/emacs/${VERSION}/lisp/progmodes/m4-mode.elc
 share/emacs/${VERSION}/lisp/progmodes/make-mode.el.gz
@@ -3758,8 +3897,12 @@ share/emacs/${VERSION}/lisp/progmodes/op
 share/emacs/${VERSION}/lisp/progmodes/opascal.elc
 share/emacs/${VERSION}/lisp/progmodes/pascal.el.gz
 share/emacs/${VERSION}/lisp/progmodes/pascal.elc
+share/emacs/${VERSION}/lisp/progmodes/peg.el.gz
+share/emacs/${VERSION}/lisp/progmodes/peg.elc
 share/emacs/${VERSION}/lisp/progmodes/perl-mode.el.gz
 share/emacs/${VERSION}/lisp/progmodes/perl-mode.elc
+share/emacs/${VERSION}/lisp/progmodes/php-ts-mode.el.gz
+share/emacs/${VERSION}/lisp/progmodes/php-ts-mode.elc
 share/emacs/${VERSION}/lisp/progmodes/prog-mode.el.gz
 share/emacs/${VERSION}/lisp/progmodes/prog-mode.elc
 share/emacs/${VERSION}/lisp/progmodes/project.el.gz
@@ -3901,6 +4044,8 @@ share/emacs/${VERSION}/lisp/term.elc
 share/emacs/${VERSION}/lisp/term/AT386.el.gz
 share/emacs/${VERSION}/lisp/term/AT386.elc
 share/emacs/${VERSION}/lisp/term/README
+share/emacs/${VERSION}/lisp/term/android-win.el.gz
+share/emacs/${VERSION}/lisp/term/android-win.elc
 share/emacs/${VERSION}/lisp/term/bobcat.el.gz
 share/emacs/${VERSION}/lisp/term/bobcat.elc
 share/emacs/${VERSION}/lisp/term/common-win.el.gz
@@ -3984,6 +4129,8 @@ share/emacs/${VERSION}/lisp/textmodes/fl
 share/emacs/${VERSION}/lisp/textmodes/flyspell.elc
 share/emacs/${VERSION}/lisp/textmodes/glyphless-mode.el.gz
 share/emacs/${VERSION}/lisp/textmodes/glyphless-mode.elc
+share/emacs/${VERSION}/lisp/textmodes/html-ts-mode.el.gz
+share/emacs/${VERSION}/lisp/textmodes/html-ts-mode.elc
 share/emacs/${VERSION}/lisp/textmodes/ispell.el.gz
 share/emacs/${VERSION}/lisp/textmodes/ispell.elc
 share/emacs/${VERSION}/lisp/textmodes/less-css-mode.el.gz
@@ -4087,6 +4234,8 @@ share/emacs/${VERSION}/lisp/tool-bar.el.
 share/emacs/${VERSION}/lisp/tool-bar.elc
 share/emacs/${VERSION}/lisp/tooltip.el.gz
 share/emacs/${VERSION}/lisp/tooltip.elc
+share/emacs/${VERSION}/lisp/touch-screen.el.gz
+share/emacs/${VERSION}/lisp/touch-screen.elc
 share/emacs/${VERSION}/lisp/transient.el.gz
 share/emacs/${VERSION}/lisp/transient.elc
 share/emacs/${VERSION}/lisp/tree-widget.el.gz
@@ -4161,8 +4310,6 @@ share/emacs/${VERSION}/lisp/url/url-vars
 share/emacs/${VERSION}/lisp/url/url.el.gz
 share/emacs/${VERSION}/lisp/url/url.elc
 share/emacs/${VERSION}/lisp/use-package/
-share/emacs/${VERSION}/lisp/use-package/bind-key.el.gz
-share/emacs/${VERSION}/lisp/use-package/bind-key.elc
 share/emacs/${VERSION}/lisp/use-package/use-package-bind-key.el.gz
 share/emacs/${VERSION}/lisp/use-package/use-package-bind-key.elc
 share/emacs/${VERSION}/lisp/use-package/use-package-core.el.gz
@@ -4270,12 +4417,16 @@ share/emacs/${VERSION}/lisp/version.el.g
 share/emacs/${VERSION}/lisp/version.elc
 share/emacs/${VERSION}/lisp/view.el.gz
 share/emacs/${VERSION}/lisp/view.elc
+share/emacs/${VERSION}/lisp/visual-wrap.el.gz
+share/emacs/${VERSION}/lisp/visual-wrap.elc
 share/emacs/${VERSION}/lisp/w32-fns.el.gz
 share/emacs/${VERSION}/lisp/w32-fns.elc
 share/emacs/${VERSION}/lisp/w32-vars.el.gz
 share/emacs/${VERSION}/lisp/w32-vars.elc
 share/emacs/${VERSION}/lisp/wdired.el.gz
 share/emacs/${VERSION}/lisp/wdired.elc
+share/emacs/${VERSION}/lisp/which-key.el.gz
+share/emacs/${VERSION}/lisp/which-key.elc
 share/emacs/${VERSION}/lisp/whitespace.el.gz
 share/emacs/${VERSION}/lisp/whitespace.elc
 share/emacs/${VERSION}/lisp/wid-browse.el.gz
@@ -4286,6 +4437,8 @@ share/emacs/${VERSION}/lisp/widget.el.gz
 share/emacs/${VERSION}/lisp/widget.elc
 share/emacs/${VERSION}/lisp/windmove.el.gz
 share/emacs/${VERSION}/lisp/windmove.elc
+share/emacs/${VERSION}/lisp/window-tool-bar.el.gz
+share/emacs/${VERSION}/lisp/window-tool-bar.elc
 share/emacs/${VERSION}/lisp/window.el.gz
 share/emacs/${VERSION}/lisp/window.elc
 share/emacs/${VERSION}/lisp/winner.el.gz


-- 
jca