git: 4a5f494344b3 - 2026Q3 - editors/emacs: Update to 31.0.91 (second pretest for 31.1)

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Ashish SHUKLA <ashish_at_FreeBSD.org>
Date: Wed, 16 Sep 2026 18:10:50 UTC
The branch 2026Q3 has been updated by ashish:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4a5f494344b3e22fbf79299349c06f06fb4e1766

commit 4a5f494344b3e22fbf79299349c06f06fb4e1766
Author:     Joseph Mingrone <jrm@FreeBSD.org>
AuthorDate: 2026-07-28 20:15:10 +0000
Commit:     Ashish SHUKLA <ashish@FreeBSD.org>
CommitDate: 2026-09-16 18:10:00 +0000

    editors/emacs: Update to 31.0.91 (second pretest for 31.1)
    
    Announcement:   https://lists.gnu.org/archive/html/emacs-devel/2026-07/msg00270.html
    Reviewed by:    ashish
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D58570
    
    (cherry picked from commit 0113e8aa6651c69850518e172172f0632384f5fb)
---
 Mk/Uses/emacs.mk                                   |   2 +-
 editors/emacs/Makefile                             |  12 +-
 editors/emacs/distinfo                             |  10 +-
 editors/emacs/files/patch-doc_lispref_parsing.texi |  82 --------
 editors/emacs/files/patch-src_image.c              |  11 --
 editors/emacs/files/patch-src_treesit.c            | 210 ---------------------
 .../emacs/files/patch-test_src_treesit-tests.el    |  16 --
 editors/emacs/pkg-plist                            | 201 +++++++++++++-------
 8 files changed, 142 insertions(+), 402 deletions(-)

diff --git a/Mk/Uses/emacs.mk b/Mk/Uses/emacs.mk
index 2b395a2ba83b..3f1602587521 100644
--- a/Mk/Uses/emacs.mk
+++ b/Mk/Uses/emacs.mk
@@ -64,7 +64,7 @@ _EMACS_VER=		32.0.50
 _EMACS_PORTDIR=		editors/emacs-devel
 _EMACS_FLAVOR=		${EMACS_DEFAULT:C/devel_//}
 .    else
-_EMACS_VER=		30.2
+_EMACS_VER=		31.0.91
 _EMACS_PORTDIR=		editors/emacs
 _EMACS_FLAVOR=		${EMACS_DEFAULT:Unox}
 .    endif
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 936790aa6f4c..144a2dba7ad0 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,13 +1,12 @@
 PORTNAME=	emacs
-DISTVERSION=	30.2
-PORTREVISION=	4
+DISTVERSION=	31.0.91
 PORTEPOCH=	3
 CATEGORIES=	editors
-MASTER_SITES=	GNU
+MASTER_SITES=	GNU_ALPHA/emacs/pretest
 
 .if ${FLAVOR:U} == canna
-PATCH_SITES+=	https://www.gentei.org/~yuuji/software/emacs30canna/:canna
-PATCHFILES+=	emacs30.1-canna-20250224.diff.gz:-p1:canna
+PATCH_SITES+=	https://www.gentei.org/~yuuji/software/emacs31canna/:canna
+PATCHFILES+=	emacs31.0.91canna-20260808.diff.gz:-p1:canna
 .endif
 
 MAINTAINER=	emacs@FreeBSD.org
@@ -90,7 +89,8 @@ INFO=		auth autotype bovine calc ccmode cl dbus dired-x ebrowse ede \
 		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 use-package \
-		vhdl-mode vip viper vtable widget wisent woman
+		vhdl-mode viper vtable widget wisent woman
+
 INFO_PATH=	${DATADIR_REL}/info
 .if ${FLAVOR:U} == canna
 PLIST_FILES+=	${DATADIR}/${DISTVERSION}/lisp/canna.el.gz \
diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo
index 2d6136af9279..cd0b3c786b58 100644
--- a/editors/emacs/distinfo
+++ b/editors/emacs/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1755212823
-SHA256 (emacs-30.2.tar.xz) = b3f36f18a6dd2715713370166257de2fae01f9d38cfe878ced9b1e6ded5befd9
-SIZE (emacs-30.2.tar.xz) = 55320324
-SHA256 (emacs30.1-canna-20250224.diff.gz) = b93296ae41037e6457317fd1113f8c3f659f32d4310c28a6a5bf633f6fcd31e5
-SIZE (emacs30.1-canna-20250224.diff.gz) = 30488
+TIMESTAMP = 1786147712
+SHA256 (emacs-31.0.91.tar.xz) = 21cff7e087e8b4f2ff9e013e359215814c322948cee71154f94864a1b0fa40a1
+SIZE (emacs-31.0.91.tar.xz) = 57959264
+SHA256 (emacs31.0.91canna-20260808.diff.gz) = f889055802b7cf4a452e023bc9fada49396e157d3d240123fe7d91fa849de120
+SIZE (emacs31.0.91canna-20260808.diff.gz) = 30410
diff --git a/editors/emacs/files/patch-doc_lispref_parsing.texi b/editors/emacs/files/patch-doc_lispref_parsing.texi
deleted file mode 100644
index 8272314fb4d4..000000000000
--- a/editors/emacs/files/patch-doc_lispref_parsing.texi
+++ /dev/null
@@ -1,82 +0,0 @@
---- doc/lispref/parsing.texi.orig	2025-01-04 11:05:28 UTC
-+++ doc/lispref/parsing.texi
-@@ -1375,7 +1375,7 @@ example, with the following pattern:
- @group
- (
-  (array :anchor (_) @@first (_) @@last :anchor)
-- (:equal @@first @@last)
-+ (:eq? @@first @@last)
- )
- @end group
- @end example
-@@ -1384,24 +1384,32 @@ group them together.  Currently there are three predic
- tree-sitter only matches arrays where the first element is equal to
- the last element.  To attach a predicate to a pattern, we need to
- group them together.  Currently there are three predicates:
--@code{:equal}, @code{:match}, and @code{:pred}.
-+@code{:eq?}, @code{:match?}, and @code{:pred?}.
- 
--@deffn Predicate :equal arg1 arg2
-+@deffn Predicate :eq? arg1 arg2
- Matches if @var{arg1} is equal to @var{arg2}.  Arguments can be either
- strings or capture names.  Capture names represent the text that the
--captured node spans in the buffer.
-+captured node spans in the buffer.  Note that this is more like
-+@code{equal} in Elisp, but @code{eq?} is the convention used by
-+tree-sitter.  Previously we supported the @code{:equal} predicate but
-+it's now considered deprecated.
- @end deffn
- 
--@deffn Predicate :match regexp capture-name
-+@deffn Predicate :match? capture-name regexp
- Matches if the text that @var{capture-name}'s node spans in the buffer
- matches regular expression @var{regexp}, given as a string literal.
--Matching is case-sensitive.
-+Matching is case-sensitive.  The ordering of the arguments doesn't
-+matter.  Previously we supported the @code{:match} predicate but it's
-+now considered deprecated.
- @end deffn
- 
--@deffn Predicate :pred fn &rest nodes
-+@deffn Predicate :pred? fn &rest nodes
- Matches if function @var{fn} returns non-@code{nil} when passed each
- node in @var{nodes} as arguments.  The function runs with the current
--buffer set to the buffer of node being queried.
-+buffer set to the buffer of node being queried.  Be very careful when
-+using this predicate, since it can be expensive when used in a tight
-+loop.  Previously we supported the @code{:pred} predicate but it's now
-+considered deprecated.
- @end deffn
- 
- Note that a predicate can only refer to capture names that appear in
-@@ -1456,9 +1464,9 @@ Anchor @code{:anchor} is written as @samp{.}.
- @item
- @samp{:+} is written as @samp{+}.
- @item
--@code{:equal}, @code{:match} and @code{:pred} are written as
--@code{#equal}, @code{#match} and @code{#pred}, respectively.
--In general, predicates change their @samp{:} to @samp{#}.
-+@code{:eq?}, @code{:match?} and @code{:pred?} are written as
-+@code{#eq?}, @code{#match?} and @code{#pred?}, respectively.  In
-+general, predicates change the @samp{:} to @samp{#}.
- @end itemize
- 
- For example,
-@@ -1467,7 +1475,7 @@ For example,
- @group
- '((
-    (compound_expression :anchor (_) @@first (_) :* @@rest)
--   (:match "love" @@first)
-+   (:match? "love" @@first)
-    ))
- @end group
- @end example
-@@ -1479,7 +1487,7 @@ is written in string form as
- @group
- "(
-   (compound_expression . (_) @@first (_)* @@rest)
--  (#match \"love\" @@first)
-+  (#match? \"love\" @@first)
-   )"
- @end group
- @end example
diff --git a/editors/emacs/files/patch-src_image.c b/editors/emacs/files/patch-src_image.c
deleted file mode 100644
index fa39972fc05b..000000000000
--- a/editors/emacs/files/patch-src_image.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/image.c.orig	2026-07-06 02:15:12 UTC
-+++ src/image.c
-@@ -12052,7 +12052,7 @@ svg_load_image (struct frame *f, struct image *img, ch
-     {
-       css = xmalloc (SBYTES (lcss) + 1);
-       strncpy (css, SSDATA (lcss), SBYTES (lcss));
--      *(css + SBYTES (lcss) + 1) = 0;
-+      *(css + SBYTES (lcss)) = 0;
-     }
- #endif
- 
diff --git a/editors/emacs/files/patch-src_treesit.c b/editors/emacs/files/patch-src_treesit.c
deleted file mode 100644
index e5bcbdca1de0..000000000000
--- a/editors/emacs/files/patch-src_treesit.c
+++ /dev/null
@@ -1,210 +0,0 @@
---- src/treesit.c.orig	2025-07-05 09:56:00 UTC
-+++ src/treesit.c
-@@ -415,17 +415,17 @@ static Lisp_Object Vtreesit_str_plus;
- static Lisp_Object Vtreesit_str_question_mark;
- static Lisp_Object Vtreesit_str_star;
- static Lisp_Object Vtreesit_str_plus;
--static Lisp_Object Vtreesit_str_pound_equal;
--static Lisp_Object Vtreesit_str_pound_match;
--static Lisp_Object Vtreesit_str_pound_pred;
-+static Lisp_Object Vtreesit_str_pound_eq_question_mark;
-+static Lisp_Object Vtreesit_str_pound_match_question_mark;
-+static Lisp_Object Vtreesit_str_pound_pred_question_mark;
- static Lisp_Object Vtreesit_str_open_bracket;
- static Lisp_Object Vtreesit_str_close_bracket;
- static Lisp_Object Vtreesit_str_open_paren;
- static Lisp_Object Vtreesit_str_close_paren;
- static Lisp_Object Vtreesit_str_space;
--static Lisp_Object Vtreesit_str_equal;
--static Lisp_Object Vtreesit_str_match;
--static Lisp_Object Vtreesit_str_pred;
-+static Lisp_Object Vtreesit_str_eq_question_mark;
-+static Lisp_Object Vtreesit_str_match_question_mark;
-+static Lisp_Object Vtreesit_str_pred_question_mark;
- static Lisp_Object Vtreesit_str_empty;
- 
- /* This is the limit on recursion levels for some tree-sitter
-@@ -632,6 +632,22 @@ treesit_load_language_push_for_each_suffix (Lisp_Objec
-     }
- }
- 
-+/* This function is a compatibility shim.  Tree-sitter 0.25 introduced
-+   ts_language_abi_version as a replacement for ts_language_version, and
-+   tree-sitter 0.26 removed ts_language_version.  Here we use the fact
-+   that 0.25 bumped TREE_SITTER_LANGUAGE_VERSION to 15, to use the new
-+   function instead of the old one, when Emacs is compiled against
-+   tree-sitter version 0.25 or newer.  */
-+static uint32_t
-+treesit_language_abi_version (const TSLanguage *ts_lang)
-+{
-+#if TREE_SITTER_LANGUAGE_VERSION >= 15
-+  return ts_language_abi_version (ts_lang);
-+#else
-+  return ts_language_version (ts_lang);
-+#endif
-+}
-+
- /* Load the dynamic library of LANGUAGE_SYMBOL and return the pointer
-    to the language definition.
- 
-@@ -746,7 +762,7 @@ treesit_load_language (Lisp_Object language_symbol,
-     {
-       *signal_symbol = Qtreesit_load_language_error;
-       *signal_data = list2 (Qversion_mismatch,
--			    make_fixnum (ts_language_version (lang)));
-+			    make_fixnum (treesit_language_abi_version (lang)));
-       return NULL;
-     }
-   return lang;
-@@ -817,7 +833,7 @@ Return nil if a grammar library for LANGUAGE is not av
- 						       &signal_data);
-       if (ts_language == NULL)
- 	return Qnil;
--      uint32_t version =  ts_language_version (ts_language);
-+      uint32_t version =  treesit_language_abi_version (ts_language);
-       return make_fixnum((ptrdiff_t) version);
-     }
- }
-@@ -2604,12 +2620,12 @@ See Info node `(elisp)Pattern Matching' for detailed e
-     return Vtreesit_str_star;
-   if (BASE_EQ (pattern, QCplus))
-     return Vtreesit_str_plus;
--  if (BASE_EQ (pattern, QCequal))
--    return Vtreesit_str_pound_equal;
--  if (BASE_EQ (pattern, QCmatch))
--    return Vtreesit_str_pound_match;
--  if (BASE_EQ (pattern, QCpred))
--    return Vtreesit_str_pound_pred;
-+  if (BASE_EQ (pattern, QCequal) || BASE_EQ (pattern, QCeq_q))
-+    return Vtreesit_str_pound_eq_question_mark;
-+  if (BASE_EQ (pattern, QCmatch) || BASE_EQ (pattern, QCmatch_q))
-+    return Vtreesit_str_pound_match_question_mark;
-+  if (BASE_EQ (pattern, QCpred) || BASE_EQ (pattern, QCpred_q))
-+    return Vtreesit_str_pound_pred_question_mark;
-   Lisp_Object opening_delimeter
-     = VECTORP (pattern)
-       ? Vtreesit_str_open_bracket : Vtreesit_str_open_paren;
-@@ -2640,7 +2656,9 @@ A PATTERN in QUERY can be
-     :*
-     :+
-     :equal
-+    :eq?
-     :match
-+    :match?
-     (TYPE PATTERN...)
-     [PATTERN...]
-     FIELD-NAME:
-@@ -2803,7 +2821,7 @@ treesit_predicate_equal (Lisp_Object args, struct capt
-   return !NILP (Fstring_equal (text1, text2));
- }
- 
--/* Handles predicate (#match "regexp" @node).  Return true if "regexp"
-+/* Handles predicate (#match? "regexp" @node).  Return true if "regexp"
-    matches the text spanned by @node; return false otherwise.
-    Matching is case-sensitive.  If everything goes fine, don't touch
-    SIGNAL_DATA; if error occurs, set it to a suitable signal data.  */
-@@ -2813,26 +2831,24 @@ treesit_predicate_match (Lisp_Object args, struct capt
- {
-   if (list_length (args) != 2)
-     {
--      *signal_data = list2 (build_string ("Predicate `match' requires two "
-+      *signal_data = list2 (build_string ("Predicate `match?' requires two "
- 					  "arguments but got"),
- 			    Flength (args));
-       return false;
-     }
--  Lisp_Object regexp = XCAR (args);
--  Lisp_Object capture_name = XCAR (XCDR (args));
-+  Lisp_Object arg1 = XCAR (args);
-+  Lisp_Object arg2 = XCAR (XCDR (args));
-+  Lisp_Object regexp = SYMBOLP (arg2) ? arg1 : arg2;
-+  Lisp_Object capture_name = SYMBOLP (arg2) ? arg2 : arg1;
- 
--  /* It's probably common to get the argument order backwards.  Catch
--     this mistake early and show helpful explanation, because Emacs
--     loves you.  (We put the regexp first because that's what
--     string-match does.)  */
--  if (!STRINGP (regexp))
--    xsignal1 (Qtreesit_query_error,
--	      build_string ("The first argument to `match' should "
--		            "be a regexp string, not a capture name"));
--  if (!SYMBOLP (capture_name))
--    xsignal1 (Qtreesit_query_error,
--	      build_string ("The second argument to `match' should "
--		            "be a capture name, not a string"));
-+  if (!STRINGP (regexp) || !SYMBOLP (capture_name))
-+    {
-+      *signal_data = list2 (build_string ("Predicate `match?' takes a regexp "
-+	                                  "and a node capture (order doesn't "
-+					  "matter), but got"),
-+			    Flength (args));
-+      return false;
-+    }
- 
-   Lisp_Object node = Qnil;
-   if (!treesit_predicate_capture_name_to_node (capture_name, captures, &node,
-@@ -2916,11 +2932,11 @@ treesit_eval_predicates (struct capture_range captures
-       Lisp_Object predicate = XCAR (tail);
-       Lisp_Object fn = XCAR (predicate);
-       Lisp_Object args = XCDR (predicate);
--      if (!NILP (Fstring_equal (fn, Vtreesit_str_equal)))
-+      if (!NILP (Fstring_equal (fn, Vtreesit_str_eq_question_mark)))
- 	pass &= treesit_predicate_equal (args, captures, signal_data);
--      else if (!NILP (Fstring_equal (fn, Vtreesit_str_match)))
-+      else if (!NILP (Fstring_equal (fn, Vtreesit_str_match_question_mark)))
- 	pass &= treesit_predicate_match (args, captures, signal_data);
--      else if (!NILP (Fstring_equal (fn, Vtreesit_str_pred)))
-+      else if (!NILP (Fstring_equal (fn, Vtreesit_str_pred_question_mark)))
- 	pass &= treesit_predicate_pred (args, captures, signal_data);
-       else
- 	{
-@@ -4192,8 +4208,11 @@ syms_of_treesit (void)
-   DEFSYM (QCstar, ":*");
-   DEFSYM (QCplus, ":+");
-   DEFSYM (QCequal, ":equal");
-+  DEFSYM (QCeq_q, ":eq?");
-   DEFSYM (QCmatch, ":match");
-+  DEFSYM (QCmatch_q, ":match?");
-   DEFSYM (QCpred, ":pred");
-+  DEFSYM (QCpred_q, ":pred?");
- 
-   DEFSYM (Qnot_found, "not-found");
-   DEFSYM (Qsymbol_error, "symbol-error");
-@@ -4324,12 +4343,12 @@ the symbol of that THING.  For example, (or sexp sente
-   Vtreesit_str_star = build_pure_c_string ("*");
-   staticpro (&Vtreesit_str_plus);
-   Vtreesit_str_plus = build_pure_c_string ("+");
--  staticpro (&Vtreesit_str_pound_equal);
--  Vtreesit_str_pound_equal = build_pure_c_string ("#equal");
--  staticpro (&Vtreesit_str_pound_match);
--  Vtreesit_str_pound_match = build_pure_c_string ("#match");
--  staticpro (&Vtreesit_str_pound_pred);
--  Vtreesit_str_pound_pred = build_pure_c_string ("#pred");
-+  staticpro (&Vtreesit_str_pound_eq_question_mark);
-+  Vtreesit_str_pound_eq_question_mark = build_pure_c_string ("#eq?");
-+  staticpro (&Vtreesit_str_pound_match_question_mark);
-+  Vtreesit_str_pound_match_question_mark = build_pure_c_string ("#match?");
-+  staticpro (&Vtreesit_str_pound_pred_question_mark);
-+  Vtreesit_str_pound_pred_question_mark = build_pure_c_string ("#pred?");
-   staticpro (&Vtreesit_str_open_bracket);
-   Vtreesit_str_open_bracket = build_pure_c_string ("[");
-   staticpro (&Vtreesit_str_close_bracket);
-@@ -4340,12 +4359,12 @@ the symbol of that THING.  For example, (or sexp sente
-   Vtreesit_str_close_paren = build_pure_c_string (")");
-   staticpro (&Vtreesit_str_space);
-   Vtreesit_str_space = build_pure_c_string (" ");
--  staticpro (&Vtreesit_str_equal);
--  Vtreesit_str_equal = build_pure_c_string ("equal");
--  staticpro (&Vtreesit_str_match);
--  Vtreesit_str_match = build_pure_c_string ("match");
--  staticpro (&Vtreesit_str_pred);
--  Vtreesit_str_pred = build_pure_c_string ("pred");
-+  staticpro (&Vtreesit_str_eq_question_mark);
-+  Vtreesit_str_eq_question_mark = build_pure_c_string ("eq?");
-+  staticpro (&Vtreesit_str_match_question_mark);
-+  Vtreesit_str_match_question_mark = build_pure_c_string ("match?");
-+  staticpro (&Vtreesit_str_pred_question_mark);
-+  Vtreesit_str_pred_question_mark = build_pure_c_string ("pred?");
-   staticpro (&Vtreesit_str_empty);
-   Vtreesit_str_empty = build_pure_c_string ("");
- 
diff --git a/editors/emacs/files/patch-test_src_treesit-tests.el b/editors/emacs/files/patch-test_src_treesit-tests.el
deleted file mode 100644
index 38a118b2b1df..000000000000
--- a/editors/emacs/files/patch-test_src_treesit-tests.el
+++ /dev/null
@@ -1,16 +0,0 @@
---- test/src/treesit-tests.el.orig	2025-01-04 11:05:31 UTC
-+++ test/src/treesit-tests.el
-@@ -434,10 +434,10 @@ BODY is the test body."
-                ;; String query.
-                '("(string) @string
- (pair key: (_) @keyword)
--((_) @bob (#match \"\\\\`B.b\\\\'\" @bob))
-+((_) @bob (#match? \"\\\\`B.b\\\\'\" @bob))
- (number) @number
--((number) @n3 (#equal \"3\" @n3))
--((number) @n3p (#pred treesit--ert-pred-last-sibling @n3p))"
-+((number) @n3 (#eq? \"3\" @n3))
-+((number) @n3p (#pred? treesit--ert-pred-last-sibling @n3p))"
-                  ;; Sexp query.
-                  ((string) @string
-                   (pair key: (_) @keyword)
diff --git a/editors/emacs/pkg-plist b/editors/emacs/pkg-plist
index 07e36d92ed90..7c8853254d39 100644
--- a/editors/emacs/pkg-plist
+++ b/editors/emacs/pkg-plist
@@ -1,4 +1,3 @@
-bin/ctags
 bin/ebrowse
 bin/emacs
 bin/emacs-%%EMACS_VER%%
@@ -8,7 +7,6 @@ include/emacs-module.h
 libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/hexl
 libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/movemail
 libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/rcs2log
-share/man/man1/ctags.1.gz
 share/man/man1/ebrowse.1.gz
 share/man/man1/emacs.1.gz
 share/man/man1/emacsclient.1.gz
@@ -57,7 +55,7 @@ share/metainfo/emacs.metainfo.xml
 %%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/NEWS.30
 %%DATADIR%%/%%EMACS_VER%%/etc/NEXTSTEP
 %%DATADIR%%/%%EMACS_VER%%/etc/NXML-NEWS
 %%DATADIR%%/%%EMACS_VER%%/etc/ORG-NEWS
@@ -482,6 +480,7 @@ share/metainfo/emacs.metainfo.xml
 %%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/kitchen-sink.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
@@ -602,6 +601,21 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/etc/images/outline-close.svg
 %%DATADIR%%/%%EMACS_VER%%/etc/images/outline-open.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/outline-open.svg
+%%DATADIR%%/%%EMACS_VER%%/etc/images/package-menu/README
+%%DATADIR%%/%%EMACS_VER%%/etc/images/package-menu/delete.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/package-menu/delete.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/package-menu/execute.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/package-menu/execute.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/package-menu/info.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/package-menu/info.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/package-menu/install.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/package-menu/install.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/package-menu/unmark.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/package-menu/unmark.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/package-menu/upgrade.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/package-menu/upgrade.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/package-menu/url.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/package-menu/url.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/paste.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/paste.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/preferences.pbm
@@ -756,6 +770,7 @@ share/metainfo/emacs.metainfo.xml
 %%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-modified.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/tabs/close.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/tabs/left-arrow.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/tabs/new.xpm
@@ -829,6 +844,7 @@ share/metainfo/emacs.metainfo.xml
 %%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-autosuggest.eld
 %%DATADIR%%/%%EMACS_VER%%/etc/package-keyring.gpg
 %%DATADIR%%/%%EMACS_VER%%/etc/ps-prin0.ps
 %%DATADIR%%/%%EMACS_VER%%/etc/ps-prin1.ps
@@ -848,6 +864,12 @@ share/metainfo/emacs.metainfo.xml
 %%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/es-dired-ref.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/es-dired-ref.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/es-refcard.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/es-refcard.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/es-survival.pdf
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/es-survival.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
@@ -878,8 +900,6 @@ share/metainfo/emacs.metainfo.xml
 %%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
@@ -897,6 +917,7 @@ share/metainfo/emacs.metainfo.xml
 %%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/dotnet-slnx.rnc
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/locate.rnc
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/msbuild.rnc
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/nuget.rnc
@@ -958,6 +979,7 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/etc/srecode/test.srt
 %%DATADIR%%/%%EMACS_VER%%/etc/srecode/texi.srt
 %%DATADIR%%/%%EMACS_VER%%/etc/srecode/wisent.srt
+%%DATADIR%%/%%EMACS_VER%%/etc/symbol-releases.eld
 %%DATADIR%%/%%EMACS_VER%%/etc/themes/adwaita-theme.el
 %%DATADIR%%/%%EMACS_VER%%/etc/themes/deeper-blue-theme.el
 %%DATADIR%%/%%EMACS_VER%%/etc/themes/dichromacy-theme.el
@@ -975,6 +997,7 @@ share/metainfo/emacs.metainfo.xml
 %%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/newcomers-presets-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
@@ -1009,7 +1032,6 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/etc/tutorials/TUTORIAL.uk
 %%DATADIR%%/%%EMACS_VER%%/etc/tutorials/TUTORIAL.zh
 %%DATADIR%%/%%EMACS_VER%%/etc/w32-feature.el
-%%DATADIR%%/%%EMACS_VER%%/etc/yow.lines
 %%DATADIR%%/%%EMACS_VER%%/lisp/COPYING
 %%DATADIR%%/%%EMACS_VER%%/lisp/README
 %%DATADIR%%/%%EMACS_VER%%/lisp/abbrev.el.gz
@@ -1182,6 +1204,8 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/calendar/cal-x.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/calendar/calendar.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/calendar/calendar.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/diary-icalendar.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/diary-icalendar.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/calendar/diary-lib.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/calendar/diary-lib.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/calendar/diary-loaddefs.el.gz
@@ -1190,6 +1214,20 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/calendar/holiday-loaddefs.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/calendar/holidays.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/calendar/holidays.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/icalendar-ast.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/icalendar-ast.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/icalendar-macs.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/icalendar-macs.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/icalendar-mode.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/icalendar-mode.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/icalendar-parser.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/icalendar-parser.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/icalendar-recur.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/icalendar-recur.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/icalendar-shortdoc.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/icalendar-shortdoc.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/icalendar-utils.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/calendar/icalendar-utils.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/calendar/icalendar.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/calendar/icalendar.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/calendar/iso8601.el.gz
@@ -1208,8 +1246,6 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/calendar/todo-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/case-table.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/case-table.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/cdl.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/cdl.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/cedet-cscope.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/cedet-cscope.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/cedet-files.el.gz
@@ -1300,8 +1336,6 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/ede/util.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
-%%DATADIR%%/%%EMACS_VER%%/lisp/cedet/pulse.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/cedet/semantic/analyze.el.gz
@@ -1595,8 +1629,6 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/dynamic-setting.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/ebuff-menu.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/ebuff-menu.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/echistory.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/echistory.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/ecomplete.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/ecomplete.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/editorconfig-conf-mode.el.gz
@@ -1675,6 +1707,8 @@ share/metainfo/emacs.metainfo.xml
 %%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/cond-star.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/cond-star.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
@@ -1711,8 +1745,8 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eldoc.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eldoc.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/elint.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/elint.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/elisp-scope.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/elisp-scope.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
@@ -1769,10 +1803,10 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/nadvice.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/oclosure.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/oclosure.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/package-activate.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/package-activate.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/package-vc.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/package-vc.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/package-x.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/package-x.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/package.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/package.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/pcase.el.gz
@@ -1799,6 +1833,8 @@ share/metainfo/emacs.metainfo.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-doc.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/shortdoc-doc.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
@@ -1819,6 +1855,8 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/text-property-search.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/thunk.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/thunk.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/timeout.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/timeout.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/timer-list.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/timer-list.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/timer.el.gz
@@ -2116,8 +2154,6 @@ share/metainfo/emacs.metainfo.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
@@ -2491,8 +2527,6 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/json.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/jsonrpc.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/jsonrpc.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/kermit.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/kermit.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/keymap.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/keymap.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/kmacro.el.gz
@@ -2619,6 +2653,8 @@ share/metainfo/emacs.metainfo.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/burmese.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/burmese.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
@@ -2657,6 +2693,8 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/ipa-praat.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/ipa.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/ipa.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/iroquoian.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/iroquoian.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/japanese.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/japanese.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/lao.el.gz
@@ -2701,12 +2739,16 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/slovak.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/symbol-ksc.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/symbol-ksc.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/syriac.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/syriac.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/tamil-dvorak.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/tamil-dvorak.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/thai.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/thai.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/tibetan.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/tibetan.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/tifinagh.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/tifinagh.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/tsang-b5.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/tsang-b5.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/leim/quail/tsang-cns.el.gz
@@ -2745,8 +2787,6 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/flow-fill.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/footnote.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/footnote.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/mail/hashcash.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/mail/hashcash.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/ietf-drums-date.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/ietf-drums-date.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/ietf-drums.el.gz
@@ -3123,30 +3163,48 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/autoload.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/bruce.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/bruce.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cc-compat.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cc-compat.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cdl.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cdl.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cl-compat.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cl-compat.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cl.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cl.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/crisp.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/crisp.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/echistory.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/echistory.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/eieio-compat.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/eieio-compat.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/elint.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/elint.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/eudcb-ph.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/eudcb-ph.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/gnus-dbus.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/gnus-dbus.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/gs.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/gs.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/gulp.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/gulp.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/hashcash.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/hashcash.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/html2text.el.gz
 %%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/idlw-complete-structtag.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/idlw-complete-structtag.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/idlw-help.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/idlw-help.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/idlw-shell.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/idlw-shell.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/idlw-toolbar.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/idlw-toolbar.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/idlwave.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/idlwave.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/kermit.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/kermit.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/landmark.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/landmark.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/linum.el.gz
@@ -3157,8 +3215,6 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/makesum.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/mantemp.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/mantemp.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/meese.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/meese.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/messcompat.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/metamail.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/metamail.elc
@@ -3168,8 +3224,8 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/netrc.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/nnir.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/nnir.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/otodo-mode.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/otodo-mode.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/package-x.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/package-x.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/pgg-def.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/pgg-def.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/pgg-gpg.el.gz
@@ -3186,8 +3242,6 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/ps-def.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/quickurl.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/quickurl.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/rlogin.el.gz
@@ -3196,10 +3250,6 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sb-image.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/starttls.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/starttls.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sup-mouse.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sup-mouse.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/terminal.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/terminal.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/thumbs.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/thumbs.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/tls.el.gz
@@ -3220,20 +3270,14 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/url-ns.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-arch.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-arch.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-dav.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-dav.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-mtn.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-mtn.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vi.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vi.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vip.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vip.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vt-control.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vt-control.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vt100-led.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vt100-led.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/ws-mode.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/ws-mode.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/yow.el.gz
-%%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-R.el.gz
@@ -3248,6 +3292,8 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-comint.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-core.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-core.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-csharp.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-csharp.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-css.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-css.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/org/ob-ditaa.el.gz
@@ -3695,16 +3741,6 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/hideshow.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/icon.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/icon.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/idlw-complete-structtag.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/idlw-complete-structtag.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/idlw-help.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/idlw-help.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/idlw-shell.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/idlw-shell.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/idlw-toolbar.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/idlw-toolbar.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/idlwave.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/idlwave.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/inf-lisp.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/inf-lisp.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/java-ts-mode.el.gz
@@ -3715,6 +3751,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-mode.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/lua-mode.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
@@ -3791,6 +3829,8 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/ps-print.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/ps-samp.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/ps-samp.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/pulse.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/pulse.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/recentf.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/recentf.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/rect.el.gz
@@ -3809,6 +3849,8 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/reveal.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/rfn-eshadow.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/rfn-eshadow.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/ring-bell-fns.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/ring-bell-fns.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/rot13.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/rot13.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/rtree.el.gz
@@ -3827,6 +3869,8 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/scroll-lock.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/select.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/select.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/send-to.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/send-to.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/server.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/server.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/ses.el.gz
@@ -3860,6 +3904,10 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/subr.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/svg.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/svg.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/system-sleep.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/system-sleep.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/system-taskbar.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/system-taskbar.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/t-mouse.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/t-mouse.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/tab-bar.el.gz
@@ -3927,6 +3975,8 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/vt100.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/vt200.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/vt200.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/term/w32-nt.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/term/w32-nt.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/w32-win.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/w32-win.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/w32console.el.gz
@@ -3971,8 +4021,14 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/less-css-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/makeinfo.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/makeinfo.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/markdown-ts-mode-x.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/markdown-ts-mode-x.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/markdown-ts-mode.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/markdown-ts-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/mhtml-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/mhtml-mode.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/mhtml-ts-mode.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/mhtml-ts-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/nroff-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/nroff-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/page-ext.el.gz
@@ -4074,8 +4130,12 @@ share/metainfo/emacs.metainfo.xml
 %%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/treesit-x.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/treesit-x.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/treesit.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/treesit.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/tty-tip.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/tty-tip.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/tutorial.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/tutorial.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/type-break.el.gz
@@ -4218,8 +4278,6 @@ share/metainfo/emacs.metainfo.xml
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-bzr.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-cvs.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-cvs.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-dav.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-dav.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-dir.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-dir.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/vc/vc-dispatcher.el.gz
@@ -4270,6 +4328,8 @@ share/metainfo/emacs.metainfo.xml
 %%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-x.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/window-x.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/window.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/window.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/winner.el.gz
@@ -4289,8 +4349,17 @@ 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/cons-1.png
+%%DATADIR%%/info/cons-2.png
+%%DATADIR%%/info/cons-2a.png
+%%DATADIR%%/info/cons-3.png
+%%DATADIR%%/info/cons-4.png
+%%DATADIR%%/info/cons-5.png
+%%DATADIR%%/info/drawers.png
 %%DATADIR%%/info/elisp_type_hierarchy.jpg
-%%DATADIR%%/info/elisp_type_hierarchy.txt
+%%DATADIR%%/info/lambda-1.png
*** 82 LINES SKIPPED ***