Re: [Update] editors/emacs 28.2 -> 29.1

[Timo Myyrä]

On Mon, Jul 31 2023, Renato Aguiar wrote:

> On Mon, Jul 31 2023, lux wrote:
>
>> Hi, Emacs 29.1 was released yesterday, I update to 29.1.
>>
>
> Maybe add textproc/tree-sitter to LIB_DEPENDS to enable the new 
> built-in tree-sitter integration?

Hi,

Here is a bit more fleshed out version for emacs-29 update.

- adds sqlite, tree-sitter and libwebp dependencies
- add texinfo as build dep to cope with info generation
- add step to rename emacs dump image to have portable name for it
- drop unused patches

Timo


diff /usr/ports
commit - 5bf3179bb9032056cf8b8a7114fd5364d403e2d6
path + /usr/ports
blob - 8424b4685309e158b3a173b29e1c00114d24ed79
file + editors/emacs/Makefile
--- editors/emacs/Makefile
+++ editors/emacs/Makefile
@@ -1,7 +1,6 @@
 COMMENT=               GNU editor: extensible, customizable, self-documenting
 
-VERSION=               28.2
-REVISION=              4
+VERSION=               29.1
 DISTNAME=              emacs-${VERSION}
 
 CATEGORIES=            editors
@@ -13,7 +12,8 @@ WANTLIB =             c curses execinfo jansson gmp gnutls m 
pthr
 # GPLv3+
 PERMIT_PACKAGE=                Yes
 
-WANTLIB =              c curses execinfo jansson gmp gnutls m pthread xml2 z
+WANTLIB =              c curses jansson gmp gnutls m pthread sqlite3 \
+                       tree-sitter xml2 z
 
 MASTER_SITES=          ${MASTER_SITE_GNU:=emacs/}
 EXTRACT_SUFX=          .tar.xz
@@ -28,10 +28,12 @@ CONFIGURE_ARGS=             --build="${GCCARCH}" \
 CONFIGURE_STYLE=       gnu
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/build-aux
 CONFIGURE_ARGS=                --build="${GCCARCH}" \
-                       --without-sound
+                       --without-sound \
+                       --without-native-compilation
 
 CONFIGURE_ENV=         CPPFLAGS="-I${LOCALBASE}/include" \
-                       LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
+                       LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}" \
+                       MAKEINFO=${PREFIX}/bin/gmakeinfo
 
 MAKE_ENV=              INSTALL_EMACS="${INSTALL_SCRIPT}" \
                        LOGNAME="${SHAREOWN}"
@@ -39,10 +41,15 @@ LIB_DEPENDS=                devel/jansson \
 SUBST_VARS=            GCCARCH VERSION
 
 USE_GMAKE=             Yes
+
+BUILD_DEPENDS=         databases/sqlite \
+                       print/texinfo
+
 LIB_DEPENDS=           devel/jansson \
                        devel/gmp \
                        security/gnutls \
-                       textproc/libxml
+                       textproc/libxml \
+                       textproc/tree-sitter
 
 .if ${FLAVOR} == "no_x11"
 CONFIGURE_ARGS+=       --without-x \
@@ -52,7 +59,8 @@ CONFIGURE_ARGS+=      --without-x \
                        --without-jpeg \
                        --without-lcms2 \
                        --without-libotf \
-                       --without-m17n-flt
+                       --without-m17n-flt \
+                       --without-webp
 .else
 LIB_DEPENDS+=          devel/harfbuzz \
                        devel/libotf \
@@ -61,6 +69,7 @@ LIB_DEPENDS+=         devel/harfbuzz \
                        graphics/tiff \
                        graphics/giflib \
                        graphics/lcms2 \
+                       graphics/libwebp \
                        misc/m17n/lib \
                        x11/dbus \
                        x11/gnome/librsvg
@@ -70,11 +79,11 @@ WANTLIB += ICE SM X11 X11-xcb Xaw3d Xext Xfixes Xinera
 . if ${FLAVOR} == "athena"
 CONFIGURE_ARGS+=       --with-x-toolkit=athena
 LIB_DEPENDS+=          x11/Xaw3d
-WANTLIB += ICE SM X11 X11-xcb Xaw3d Xext Xfixes Xinerama Xmu
-WANTLIB += Xpm Xrandr Xrender Xt cairo dbus-1 fontconfig freetype
-WANTLIB += gdk_pixbuf-2.0 gif gio-2.0 glib-2.0 gobject-2.0 harfbuzz
-WANTLIB += intl jpeg lcms2 m17n-core m17n-flt otf png rsvg-2 tiff
-WANTLIB += xcb
+WANTLIB += ICE SM X11 X11-xcb Xaw3d Xcomposite Xext Xfixes Xi
+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 rsvg-2
+WANTLIB += sharpyuv tiff webp webpdemux xcb xcb-shape xcb-util
 . elif ${FLAVOR} == "gtk2"
 CONFIGURE_ARGS+=       --with-x-toolkit=gtk2
 LIB_DEPENDS+=          x11/gtk+2
@@ -83,23 +92,32 @@ WANTLIB += pangoft2-1.0 png rsvg-2 tiff xcb
 WANTLIB += dbus-1 fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
 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 xcb
+WANTLIB += pangoft2-1.0 png rsvg-2 sharpyuv tiff webp webpdemux
+WANTLIB += xcb xcb-shape xcb-util
 . elif ${FLAVOR} == "gtk3"
 CONFIGURE_ARGS+=       --with-x-toolkit=gtk3
 LIB_DEPENDS+=          x11/gtk+3
-WANTLIB += ICE SM X11 X11-xcb Xext Xfixes Xinerama Xpm Xrandr
-WANTLIB += Xrender atk-1.0 cairo cairo-gobject dbus-1 fontconfig
-WANTLIB += freetype gdk-3 gdk_pixbuf-2.0 gif gio-2.0 glib-2.0
-WANTLIB += gobject-2.0 gtk-3 harfbuzz intl jpeg lcms2 m17n-core
-WANTLIB += m17n-flt otf pango-1.0 pangocairo-1.0 png rsvg-2 tiff
-WANTLIB += xcb
+WANTLIB += ICE SM X11 X11-xcb Xcomposite Xext Xfixes Xi Xinerama Xpm
+WANTLIB += Xrandr Xrender atk-1.0 cairo cairo-gobject dbus-1
+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 rsvg-2
+WANTLIB += sharpyuv tiff webp webpdemux xcb xcb-shape xcb-util
 . else
 ERRORS+=               "Fatal: Conflicting flavor: ${FLAVOR}"
 . endif
 .endif
 
+# backtrace() crashes at build time on powerpc
+.if ${MACHINE_ARCH} == "powerpc"
+CONFIGURE_ENV +=       ac_cv_header_execinfo_h=no
+.else
+WANTLIB +=             execinfo
+.endif
+
 post-install:
        chmod -t ${PREFIX}/bin/emacs-${VERSION}
+       mv ${PREFIX}/libexec/emacs/${VERSION}/${GCCARCH}/emacs-*.pdmp 
${PREFIX}/libexec/emacs/${VERSION}/${GCCARCH}/emacs.pdmp
 .if ${FLAVOR:Mno_x11}
        rm -Rf ${PREFIX}/share/applications/ ${PREFIX}/share/icons/
 .endif
blob - f69c33c98903deea45ab3e2c5430bde0e143ae5c
file + editors/emacs/distinfo
--- editors/emacs/distinfo
+++ editors/emacs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (emacs-28.2.tar.xz) = 7iEYIjPvMjLcl7SGry2G4UBC27ZbvFNd9WLDqFgjJIg=
-SIZE (emacs-28.2.tar.xz) = 47722600
+SHA256 (emacs-29.1.tar.xz) = 0viBpcwjHi9aA+hvRYSwQ4+D7ddZignSSiG9jQA+LgE=
+SIZE (emacs-29.1.tar.xz) = 52081008
blob - 5da62bf1f3b6dc0abd682d65d943e975ccd139be
file + /dev/null
--- editors/emacs/patches/patch-etc_emacsclient-mail_desktop
+++ /dev/null
@@ -1,28 +0,0 @@
-"Fix emacsclient-mail.desktop code injection vulnerability" (CVE-2023-27985, 
CVE-2023-27986)
-https://git.savannah.gnu.org/cgit/emacs.git/commit/?h=emacs-29&id=3c1693d08b0a71d40a77e7b40c0ebc42dca2d2cc
-https://git.savannah.gnu.org/cgit/emacs.git/commit/?h=emacs-29&id=c8ec0017cb96d4ac98be21e1fe9a95e1aa723e99
-
-Index: etc/emacsclient-mail.desktop
---- etc/emacsclient-mail.desktop.orig
-+++ etc/emacsclient-mail.desktop
-@@ -1,7 +1,10 @@
- [Desktop Entry]
- Categories=Network;Email;
- Comment=GNU Emacs is an extensible, customizable text editor - and more
--Exec=sh -c "exec emacsclient --alternate-editor= --display=\\"\\$DISPLAY\\" 
--eval \\\\(message-mailto\\\\ \\\\\\"%u\\\\\\"\\\\)"
-+# We want to pass the following commands to the shell wrapper:
-+# u=$(echo "$1" | sed 's/[\"]/\\&/g'); exec emacsclient --alternate-editor= 
--display="$DISPLAY" --eval "(message-mailto \"$u\")"
-+# Special chars '"', '$', and '\' must be escaped as '\\"', '\\$', and '\\\\'.
-+Exec=sh -c "u=\\$(echo \\"\\$1\\" | sed 's/[\\\\\\"]/\\\\\\\\&/g'); exec 
emacsclient --alternate-editor= --display=\\"\\$DISPLAY\\" --eval 
\\"(message-mailto \\\\\\"\\$u\\\\\\")\\"" sh %u
- Icon=emacs
- Name=Emacs (Mail, Client)
- MimeType=x-scheme-handler/mailto;
-@@ -13,7 +16,7 @@ Actions=new-window;new-instance;
- 
- [Desktop Action new-window]
- Name=New Window
--Exec=emacsclient --alternate-editor= --create-frame --eval "(message-mailto 
\\"%u\\")"
-+Exec=sh -c "u=\\$(echo \\"\\$1\\" | sed 's/[\\\\\\"]/\\\\\\\\&/g'); exec 
emacsclient --alternate-editor= --create-frame --eval \\"(message-mailto 
\\\\\\"\\$u\\\\\\")\\"" sh %u
- 
- [Desktop Action new-instance]
- Name=New Instance
blob - 8782e5147d60a6a40fde98375e5a9ffb69fad182
file + /dev/null
--- editors/emacs/patches/patch-lib-src_etags_c
+++ /dev/null
@@ -1,329 +0,0 @@
-"Fixed ctags local command execute vulnerability" (CVE-2022-45939)
-https://git.savannah.gnu.org/cgit/emacs.git/commit/?h=emacs-28&id=5d05ea803e9996c4c1edbe0fa0f6f5b05d2ffc87
-https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=d48bb4874bc6cd3e69c7a15fc3c91cc141025c51
-
-"Fix etags local command injection vulnerability" (CVE-2022-48337)
-https://git.savannah.gnu.org/cgit/emacs.git/commit/?h=emacs-28&id=e339926272a598bd9ee7e02989c1662b89e64cf0
-https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=01a4035c869b91c153af9a9132c87adb7669ea1c
-
-Index: lib-src/etags.c
---- lib-src/etags.c.orig
-+++ lib-src/etags.c
-@@ -382,7 +382,7 @@ static void just_read_file (FILE *);
- 
- static language *get_language_from_langname (const char *);
- static void readline (linebuffer *, FILE *);
--static ptrdiff_t readline_internal (linebuffer *, FILE *, char const *);
-+static ptrdiff_t readline_internal (linebuffer *, FILE *, char const *, const 
bool);
- static bool nocase_tail (const char *);
- static void get_tag (char *, char **);
- static void get_lispy_tag (char *);
-@@ -406,7 +406,10 @@ static void free_fdesc (fdesc *);
- static void pfnote (char *, bool, char *, ptrdiff_t, intmax_t, intmax_t);
- static void invalidate_nodes (fdesc *, node **);
- static void put_entries (node *);
-+static void clean_matched_file_tag (char const * const, char const * const);
- 
-+static char *escape_shell_arg_string (char *);
-+static void do_move_file (const char *, const char *);
- static char *concat (const char *, const char *, const char *);
- static char *skip_spaces (char *);
- static char *skip_non_spaces (char *);
-@@ -1339,7 +1342,7 @@ main (int argc, char **argv)
-                 if (parsing_stdin)
-                   fatal ("cannot parse standard input "
-                          "AND read file names from it");
--                while (readline_internal (&filename_lb, stdin, "-") > 0)
-+                while (readline_internal (&filename_lb, stdin, "-", false) > 
0)
-                   process_file_name (filename_lb.buffer, lang);
-               }
-             else
-@@ -1387,9 +1390,6 @@ main (int argc, char **argv)
-   /* From here on, we are in (CTAGS && !cxref_style) */
-   if (update)
-     {
--      char *cmd =
--      xmalloc (strlen (tagfile) + whatlen_max +
--               sizeof "mv..OTAGS;grep -Fv '\t\t' OTAGS >;rm OTAGS");
-       for (i = 0; i < current_arg; ++i)
-       {
-         switch (argbuffer[i].arg_type)
-@@ -1400,17 +1400,8 @@ main (int argc, char **argv)
-           default:
-             continue;         /* the for loop */
-           }
--        char *z = stpcpy (cmd, "mv ");
--        z = stpcpy (z, tagfile);
--        z = stpcpy (z, " OTAGS;grep -Fv '\t");
--        z = stpcpy (z, argbuffer[i].what);
--        z = stpcpy (z, "\t' OTAGS >");
--        z = stpcpy (z, tagfile);
--        strcpy (z, ";rm OTAGS");
--        if (system (cmd) != EXIT_SUCCESS)
--          fatal ("failed to execute shell command");
-+          clean_matched_file_tag (tagfile, argbuffer[i].what);
-       }
--      free (cmd);
-       append_to_tagfile = true;
-     }
- 
-@@ -1439,7 +1430,52 @@ main (int argc, char **argv)
-   return EXIT_SUCCESS;
- }
- 
-+/*
-+ * Equivalent to: mv tags OTAGS;grep -Fv ' filename ' OTAGS >tags;rm OTAGS
-+ */
-+static void
-+clean_matched_file_tag (const char* tagfile, const char* match_file_name)
-+{
-+  FILE *otags_f = fopen ("OTAGS", "wb");
-+  FILE *tag_f = fopen (tagfile, "rb");
- 
-+  if (otags_f == NULL)
-+    pfatal ("OTAGS");
-+
-+  if (tag_f == NULL)
-+    pfatal (tagfile);
-+
-+  int buf_len = strlen (match_file_name) + sizeof ("\t\t ") + 1;
-+  char *buf = xmalloc (buf_len);
-+  snprintf (buf, buf_len, "\t%s\t", match_file_name);
-+
-+  linebuffer line;
-+  linebuffer_init (&line);
-+  while (readline_internal (&line, tag_f, tagfile, true) > 0)
-+    {
-+      if (ferror (tag_f))
-+        pfatal (tagfile);
-+
-+      if (strstr (line.buffer, buf) == NULL)
-+        {
-+          fprintf (otags_f, "%s\n", line.buffer);
-+          if (ferror (tag_f))
-+            pfatal (tagfile);
-+        }
-+    }
-+  free (buf);
-+  free (line.buffer);
-+
-+  if (fclose (otags_f) == EOF)
-+    pfatal ("OTAGS");
-+
-+  if (fclose (tag_f) == EOF)
-+    pfatal (tagfile);
-+
-+  do_move_file ("OTAGS", tagfile);
-+  return;
-+}
-+
- /*
-  * Return a compressor given the file name.  If EXTPTR is non-zero,
-  * return a pointer into FILE where the compressor-specific
-@@ -1669,13 +1705,18 @@ process_file_name (char *file, language *lang)
-       else
-       {
- #if MSDOS || defined (DOS_NT)
--        char *cmd1 = concat (compr->command, " \"", real_name);
--        char *cmd = concat (cmd1, "\" > ", tmp_name);
-+          int buf_len = strlen (compr->command) + strlen (" \"\" > \"\"") + 
strlen (real_name) + strlen (tmp_name) + 1;
-+          char *cmd = xmalloc (buf_len);
-+          snprintf (cmd, buf_len, "%s \"%s\" > \"%s\"", compr->command, 
real_name, tmp_name);
- #else
--        char *cmd1 = concat (compr->command, " '", real_name);
--        char *cmd = concat (cmd1, "' > ", tmp_name);
-+          char *new_real_name = escape_shell_arg_string (real_name);
-+          char *new_tmp_name = escape_shell_arg_string (tmp_name);
-+          int buf_len = strlen (compr->command) + strlen ("  > ") + strlen 
(new_real_name) + strlen (new_tmp_name) + 1;
-+          char *cmd = xmalloc (buf_len);
-+          snprintf (cmd, buf_len, "%s %s > %s", compr->command, 
new_real_name, new_tmp_name);
-+          free (new_real_name);
-+          free (new_tmp_name);
- #endif
--        free (cmd1);
-         inf = (system (cmd) == -1
-                ? NULL
-                : fopen (tmp_name, "r" FOPEN_BINARY));
-@@ -1822,7 +1863,7 @@ find_entries (FILE *inf)
- 
-   /* Else look for sharp-bang as the first two characters. */
-   if (parser == NULL
--      && readline_internal (&lb, inf, infilename) > 0
-+      && readline_internal (&lb, inf, infilename, false) > 0
-       && lb.len >= 2
-       && lb.buffer[0] == '#'
-       && lb.buffer[1] == '!')
-@@ -6861,7 +6902,7 @@ analyze_regex (char *regex_arg)
-       if (regexfp == NULL)
-         pfatal (regexfile);
-       linebuffer_init (&regexbuf);
--      while (readline_internal (&regexbuf, regexfp, regexfile) > 0)
-+      while (readline_internal (&regexbuf, regexfp, regexfile, false) > 0)
-         analyze_regex (regexbuf.buffer);
-       free (regexbuf.buffer);
-       if (fclose (regexfp) != 0)
-@@ -7209,11 +7250,13 @@ get_lispy_tag (register char *bp)
- 
- /*
-  * Read a line of text from `stream' into `lbp', excluding the
-- * newline or CR-NL, if any.  Return the number of characters read from
-- * `stream', which is the length of the line including the newline.
-+ * newline or CR-NL (if `leave_cr` is false), if any.  Return the
-+ * number of characters read from `stream', which is the length
-+ * of the line including the newline.
-  *
-- * On DOS or Windows we do not count the CR character, if any before the
-- * NL, in the returned length; this mirrors the behavior of Emacs on those
-+ * On DOS or Windows, if `leave_cr` is false, we do not count the
-+ * CR character, if any before the NL, in the returned length;
-+ * this mirrors the behavior of Emacs on those
-  * platforms (for text files, it translates CR-NL to NL as it reads in the
-  * file).
-  *
-@@ -7221,7 +7264,7 @@ get_lispy_tag (register char *bp)
-  * appended to `filebuf'.
-  */
- static ptrdiff_t
--readline_internal (linebuffer *lbp, FILE *stream, char const *filename)
-+readline_internal (linebuffer *lbp, FILE *stream, char const *filename, const 
bool leave_cr)
- {
-   char *buffer = lbp->buffer;
-   char *p = lbp->buffer;
-@@ -7251,19 +7294,19 @@ readline_internal (linebuffer *lbp, FILE *stream, char
-         break;
-       }
-       if (c == '\n')
--      {
--        if (p > buffer && p[-1] == '\r')
--          {
--            p -= 1;
--            chars_deleted = 2;
--          }
--        else
--          {
--            chars_deleted = 1;
--          }
--        *p = '\0';
--        break;
--      }
-+        {
-+          if (!leave_cr && p > buffer && p[-1] == '\r')
-+            {
-+              p -= 1;
-+              chars_deleted = 2;
-+            }
-+          else
-+            {
-+              chars_deleted = 1;
-+            }
-+          *p = '\0';
-+          break;
-+        }
-       *p++ = c;
-     }
-   lbp->len = p - buffer;
-@@ -7294,7 +7337,7 @@ static void
- readline (linebuffer *lbp, FILE *stream)
- {
-   linecharno = charno;                /* update global char number of line 
start */
--  ptrdiff_t result = readline_internal (lbp, stream, infilename);
-+  ptrdiff_t result = readline_internal (lbp, stream, infilename, false);
-   lineno += 1;                        /* increment global line number */
-   charno += result;           /* increment global char number */
- 
-@@ -7650,6 +7693,95 @@ etags_mktmp (void)
- #endif
- 
-   return templt;
-+}
-+
-+/*
-+ * Adds single quotes around a string, if found single quotes, escaped it.
-+ * Return a newly-allocated string.
-+ *
-+ * For example:
-+ * escape_shell_arg_string("test.txt") => 'test.txt'
-+ * escape_shell_arg_string("'test.txt") => ''\''test.txt'
-+ */
-+static char *
-+escape_shell_arg_string (char *str)
-+{
-+  char *p = str;
-+  int need_space = 2;           /* ' at begin and end */
-+
-+  while (*p != '\0')
-+    {
-+      if (*p == '\'')
-+        need_space += 4;        /* ' to '\'', length is 4 */
-+      else
-+        need_space++;
-+
-+      p++;
-+    }
-+
-+  char *new_str = xnew (need_space + 1, char);
-+  new_str[0] = '\'';
-+  new_str[need_space-1] = '\'';
-+
-+  int i = 1;                    /* skip first byte */
-+  p = str;
-+  while (*p != '\0')
-+    {
-+      new_str[i] = *p;
-+      if (*p == '\'')
-+        {
-+          new_str[i+1] = '\\';
-+          new_str[i+2] = '\'';
-+          new_str[i+3] = '\'';
-+          i += 3;
-+        }
-+
-+      i++;
-+      p++;
-+    }
-+
-+  new_str[need_space] = '\0';
-+  return new_str;
-+}
-+
-+static void
-+do_move_file(const char *src_file, const char *dst_file)
-+{
-+  if (rename (src_file, dst_file) == 0)
-+    return;
-+
-+  FILE *src_f = fopen (src_file, "rb");
-+  FILE *dst_f = fopen (dst_file, "wb");
-+
-+  if (src_f == NULL)
-+    pfatal (src_file);
-+
-+  if (dst_f == NULL)
-+    pfatal (dst_file);
-+
-+  int c;
-+  while ((c = fgetc (src_f)) != EOF)
-+    {
-+      if (ferror (src_f))
-+        pfatal (src_file);
-+
-+      if (ferror (dst_f))
-+        pfatal (dst_file);
-+
-+      if (fputc (c, dst_f) == EOF)
-+        pfatal ("cannot write");
-+    }
-+
-+  if (fclose (src_f) == EOF)
-+    pfatal (src_file);
-+
-+  if (fclose (dst_f) == EOF)
-+    pfatal (dst_file);
-+
-+  if (unlink (src_file) == -1)
-+    pfatal ("unlink error");
-+
-+  return;
- }
- 
- /* Return a newly allocated string containing the file name of FILE
blob - 2d85982a07f9c0f4a92515f821cef1a64a8cf80f
file + /dev/null
--- editors/emacs/patches/patch-lisp_htmlfontify_el
+++ /dev/null
@@ -1,17 +0,0 @@
-"Fix htmlfontify.el command injection vulnerability." (CVE-2022-48339)
-https://debbugs.gnu.org/cgi/bugreport.cgi?bug=60295
-https://git.savannah.gnu.org/cgit/emacs.git/commit/?h=emacs-28&id=807d2d5b3a7cd1d0e3f7dd24de22770f54f5ae16
-https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=1b4dc4691c1f87fc970fbe568b43869a15ad0d4c
-
-Index: lisp/htmlfontify.el
---- lisp/htmlfontify.el.orig
-+++ lisp/htmlfontify.el
-@@ -1882,7 +1882,7 @@ Hardly bombproof, but good enough in the context in wh
- 
- (defun hfy-text-p (srcdir file)
-   "Is SRCDIR/FILE text?  Use `hfy-istext-command' to determine this."
--  (let* ((cmd (format hfy-istext-command (expand-file-name file srcdir)))
-+  (let* ((cmd (format hfy-istext-command (shell-quote-argument 
(expand-file-name file srcdir))))
-          (rsp (shell-command-to-string    cmd)))
-     (string-match "text" rsp)))
- 
blob - 5ffef2521c044ae86832d8c5256f62c39b6759a4
file + /dev/null
--- editors/emacs/patches/patch-lisp_org_ob-latex_el
+++ /dev/null
@@ -1,39 +0,0 @@
-"Fixed command injection vulnerability" (CVE-2023-28617)
-https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?id=a8006ea580ed74f27f974d60b598143b04ad1741
-https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?id=8f8ec2ccf3f5ef8f38d68ec84a7e4739c45db485
-
-Index: lisp/org/ob-latex.el
---- lisp/org/ob-latex.el.orig
-+++ lisp/org/ob-latex.el
-@@ -167,7 +167,7 @@ This function is called by `org-babel-execute-src-bloc
-                            tmp-pdf
-                              (list org-babel-latex-pdf-svg-process)
-                              extension err-msg log-buf)))
--              (shell-command (format "mv %s %s" img-out out-file)))))
-+              (rename-file img-out out-file t))))
-          ((string-suffix-p ".tikz" out-file)
-         (when (file-exists-p out-file) (delete-file out-file))
-         (with-temp-file out-file
-@@ -205,17 +205,14 @@ This function is called by `org-babel-execute-src-bloc
-           (if (string-suffix-p ".svg" out-file)
-               (progn
-                 (shell-command "pwd")
--                (shell-command (format "mv %s %s"
--                                       (concat (file-name-sans-extension 
tex-file) "-1.svg")
--                                       out-file)))
-+                  (rename-file (concat (file-name-sans-extension tex-file) 
"-1.svg")
-+                               out-file t))
-             (error "SVG file produced but HTML file requested")))
-          ((file-exists-p (concat (file-name-sans-extension tex-file) ".html"))
-           (if (string-suffix-p ".html" out-file)
--              (shell-command "mv %s %s"
--                             (concat (file-name-sans-extension tex-file)
--                                     ".html")
--                             out-file)
--            (error "HTML file produced but SVG file requested")))))
-+                (rename-file (concat (file-name-sans-extension tex-file) 
".html")
-+                             out-file t)
-+              (error "HTML file produced but SVG file requested")))))
-        ((or (string= "pdf" extension) imagemagick)
-         (with-temp-file tex-file
-           (require 'ox-latex)
blob - fb3a3d6aa13a4cb3a9bc0ab46a8105f4baf1b18d
file + /dev/null
--- editors/emacs/patches/patch-lisp_progmodes_ruby-mode_el
+++ /dev/null
@@ -1,16 +0,0 @@
-"Fix ruby-mode.el local command injection vulnerability (bug#60268)" 
(CVE-2022-48338)
-https://debbugs.gnu.org/cgi/bugreport.cgi?bug=60268
-https://git.savannah.gnu.org/cgit/emacs.git/commit/?h=emacs-28&id=22fb5ff5126dc8bb01edaa0252829d853afb284f
-https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=9a3b08061feea14d6f37685ca1ab8801758bfd1c
-
---- lisp/progmodes/ruby-mode.el.orig
-+++ lisp/progmodes/ruby-mode.el
-@@ -1819,7 +1819,7 @@ or `gem' statement around point."
-       (setq feature-name (read-string "Feature name: " init))))
-   (let ((out
-          (substring
--          (shell-command-to-string (concat "gem which " feature-name))
-+          (shell-command-to-string (concat "gem which " (shell-quote-argument 
feature-name)))
-           0 -1)))
-     (if (string-match-p "\\`ERROR" out)
-         (user-error "%s" out)
blob - f08cdc37081d425b28b840288fc4841dcdf75a6b
file + editors/emacs/patches/patch-src_emacs_c
--- editors/emacs/patches/patch-src_emacs_c
+++ editors/emacs/patches/patch-src_emacs_c
@@ -3,15 +3,19 @@ Index: src/emacs.c
 Index: src/emacs.c
 --- src/emacs.c.orig
 +++ src/emacs.c
-@@ -2746,21 +2746,13 @@ shut_down_emacs (int sig, Lisp_Object stuff)
+@@ -2958,25 +2958,17 @@
        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))];
-+        static char const fmt[] = "Fatal error %d: ";
 +        char buf[sizeof fmt - strlen ("%d") + INT_STRLEN_BOUND (int) + 1];
          char const *sig_desc = safe_strsignal (sig);
 -        int nlen;
blob - e9a0fdbd8d166d509c675a5ec5ac3eed22f3939f
file + editors/emacs/pkg/PLIST
--- editors/emacs/pkg/PLIST
+++ editors/emacs/pkg/PLIST
@@ -30,6 +30,7 @@ include/emacs-module.h
 @info info/ediff.info
 @info info/edt.info
 @info info/efaq.info
+@info info/eglot.info
 @info info/eieio.info
 @info info/eintr.info
 @info info/elisp.info
@@ -74,14 +75,14 @@ include/emacs-module.h
 @info info/tramp.info
 @info info/transient.info
 @info info/url.info
+@info info/use-package.info
 @info info/vhdl-mode.info
 @info info/vip.info
 @info info/viper.info
+@info info/vtable.info
 @info info/widget.info
 @info info/wisent.info
 @info info/woman.info
-lib/systemd/
-lib/systemd/user/
 lib/systemd/user/emacs.service
 libexec/emacs/
 libexec/emacs/${VERSION}/
@@ -96,7 +97,6 @@ share/emacs/
 @man man/man1/emacsclient.1
 @man man/man1/etags.1
 share/doc/pkg-readmes/${PKGSTEM}
-share/emacs/
 share/emacs/${VERSION}/
 share/emacs/${VERSION}/etc/
 share/emacs/${VERSION}/etc/AUTHORS
@@ -106,6 +106,7 @@ share/emacs/${VERSION}/etc/ERC-NEWS
 share/emacs/${VERSION}/etc/DEVEL.HUMOR
 share/emacs/${VERSION}/etc/DISTRIB
 share/emacs/${VERSION}/etc/DOC
+share/emacs/${VERSION}/etc/EGLOT-NEWS
 share/emacs/${VERSION}/etc/ERC-NEWS
 share/emacs/${VERSION}/etc/ETAGS.EBNF
 share/emacs/${VERSION}/etc/ETAGS.README
@@ -126,6 +127,7 @@ share/emacs/${VERSION}/etc/NEXTSTEP
 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/NEXTSTEP
 share/emacs/${VERSION}/etc/NXML-NEWS
 share/emacs/${VERSION}/etc/ORG-NEWS
@@ -271,6 +273,7 @@ share/emacs/${VERSION}/etc/edt-user.el
 share/emacs/${VERSION}/etc/e/README
 share/emacs/${VERSION}/etc/e/eterm-color
 share/emacs/${VERSION}/etc/e/eterm-color.ti
+share/emacs/${VERSION}/etc/e/eterm-direct
 share/emacs/${VERSION}/etc/edt-user.el
 share/emacs/${VERSION}/etc/emacs-buffer.gdb
 share/emacs/${VERSION}/etc/emacs-mail.desktop
@@ -278,6 +281,7 @@ share/emacs/${VERSION}/etc/emacsclient-mail.desktop
 share/emacs/${VERSION}/etc/emacs.icon
 share/emacs/${VERSION}/etc/emacs.metainfo.xml
 share/emacs/${VERSION}/etc/emacs.service
+share/emacs/${VERSION}/etc/emacs_lldb.py
 share/emacs/${VERSION}/etc/emacsclient-mail.desktop
 share/emacs/${VERSION}/etc/emacsclient.desktop
 share/emacs/${VERSION}/etc/enriched.txt
@@ -307,6 +311,8 @@ share/emacs/${VERSION}/etc/images/connect.pbm
 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/connect-to-url.pbm
+share/emacs/${VERSION}/etc/images/connect-to-url.xpm
 share/emacs/${VERSION}/etc/images/connect.pbm
 share/emacs/${VERSION}/etc/images/connect.xpm
 share/emacs/${VERSION}/etc/images/contact.pbm
@@ -399,70 +405,26 @@ share/emacs/${VERSION}/etc/images/gnus/catchup.pbm
 share/emacs/${VERSION}/etc/images/gnus/
 share/emacs/${VERSION}/etc/images/gnus.pbm
 share/emacs/${VERSION}/etc/images/gnus/README
-share/emacs/${VERSION}/etc/images/gnus/catchup.pbm
-share/emacs/${VERSION}/etc/images/gnus/catchup.xpm
-share/emacs/${VERSION}/etc/images/gnus/cu-exit.pbm
-share/emacs/${VERSION}/etc/images/gnus/cu-exit.xpm
-share/emacs/${VERSION}/etc/images/gnus/describe-group.pbm
-share/emacs/${VERSION}/etc/images/gnus/describe-group.xpm
-share/emacs/${VERSION}/etc/images/gnus/exit-gnus.pbm
-share/emacs/${VERSION}/etc/images/gnus/exit-gnus.xpm
-share/emacs/${VERSION}/etc/images/gnus/exit-summ.pbm
-share/emacs/${VERSION}/etc/images/gnus/exit-summ.xpm
 share/emacs/${VERSION}/etc/images/gnus/followup.pbm
 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/get-news.pbm
-share/emacs/${VERSION}/etc/images/gnus/get-news.xpm
-share/emacs/${VERSION}/etc/images/gnus/gnntg.pbm
-share/emacs/${VERSION}/etc/images/gnus/gnntg.xpm
 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
 share/emacs/${VERSION}/etc/images/gnus/gnus.svg
 share/emacs/${VERSION}/etc/images/gnus/gnus.xbm
 share/emacs/${VERSION}/etc/images/gnus/gnus.xpm
-share/emacs/${VERSION}/etc/images/gnus/important.pbm
-share/emacs/${VERSION}/etc/images/gnus/important.xpm
 share/emacs/${VERSION}/etc/images/gnus/kill-group.pbm
 share/emacs/${VERSION}/etc/images/gnus/kill-group.xpm
 share/emacs/${VERSION}/etc/images/gnus/mail-reply.pbm
 share/emacs/${VERSION}/etc/images/gnus/mail-reply.xpm
 share/emacs/${VERSION}/etc/images/gnus/mail-send.pbm
 share/emacs/${VERSION}/etc/images/gnus/mail-send.xpm
-share/emacs/${VERSION}/etc/images/gnus/next-ur.pbm
-share/emacs/${VERSION}/etc/images/gnus/next-ur.xpm
-share/emacs/${VERSION}/etc/images/gnus/post.pbm
-share/emacs/${VERSION}/etc/images/gnus/post.xpm
-share/emacs/${VERSION}/etc/images/gnus/prev-ur.pbm
-share/emacs/${VERSION}/etc/images/gnus/prev-ur.xpm
 share/emacs/${VERSION}/etc/images/gnus/preview.xbm
 share/emacs/${VERSION}/etc/images/gnus/preview.xpm
-share/emacs/${VERSION}/etc/images/gnus/receipt.pbm
-share/emacs/${VERSION}/etc/images/gnus/receipt.xpm
-share/emacs/${VERSION}/etc/images/gnus/reply-wo.pbm
-share/emacs/${VERSION}/etc/images/gnus/reply-wo.xpm
-share/emacs/${VERSION}/etc/images/gnus/reply.pbm
-share/emacs/${VERSION}/etc/images/gnus/reply.xpm
-share/emacs/${VERSION}/etc/images/gnus/rot13.pbm
-share/emacs/${VERSION}/etc/images/gnus/rot13.xpm
-share/emacs/${VERSION}/etc/images/gnus/save-aif.pbm
-share/emacs/${VERSION}/etc/images/gnus/save-aif.xpm
-share/emacs/${VERSION}/etc/images/gnus/save-art.pbm
-share/emacs/${VERSION}/etc/images/gnus/save-art.xpm
-share/emacs/${VERSION}/etc/images/gnus/subscribe.pbm
-share/emacs/${VERSION}/etc/images/gnus/subscribe.xpm
 share/emacs/${VERSION}/etc/images/gnus/toggle-subscription.pbm
 share/emacs/${VERSION}/etc/images/gnus/toggle-subscription.xpm
-share/emacs/${VERSION}/etc/images/gnus/unimportant.pbm
-share/emacs/${VERSION}/etc/images/gnus/unimportant.xpm
-share/emacs/${VERSION}/etc/images/gnus/unsubscribe.pbm
-share/emacs/${VERSION}/etc/images/gnus/unsubscribe.xpm
-share/emacs/${VERSION}/etc/images/gnus/uu-decode.pbm
-share/emacs/${VERSION}/etc/images/gnus/uu-decode.xpm
-share/emacs/${VERSION}/etc/images/gnus/uu-post.pbm
-share/emacs/${VERSION}/etc/images/gnus/uu-post.xpm
 share/emacs/${VERSION}/etc/images/gud/
 share/emacs/${VERSION}/etc/images/gud/README
 share/emacs/${VERSION}/etc/images/gud/all.pbm
@@ -728,6 +690,10 @@ share/emacs/${VERSION}/etc/images/paste.pbm
 share/emacs/${VERSION}/etc/images/next-page.xpm
 share/emacs/${VERSION}/etc/images/open.pbm
 share/emacs/${VERSION}/etc/images/open.xpm
+share/emacs/${VERSION}/etc/images/outline-close.pbm
+share/emacs/${VERSION}/etc/images/outline-close.svg
+share/emacs/${VERSION}/etc/images/outline-open.pbm
+share/emacs/${VERSION}/etc/images/outline-open.svg
 share/emacs/${VERSION}/etc/images/paste.pbm
 share/emacs/${VERSION}/etc/images/paste.xpm
 share/emacs/${VERSION}/etc/images/preferences.pbm
@@ -856,6 +822,8 @@ share/emacs/${VERSION}/etc/images/tree-widget/default/
 share/emacs/${VERSION}/etc/images/tree-widget/default/no-guide.xpm
 share/emacs/${VERSION}/etc/images/tree-widget/default/no-handle.png
 share/emacs/${VERSION}/etc/images/tree-widget/default/no-handle.xpm
+share/emacs/${VERSION}/etc/images/tree-widget/default/nohandle-guide.png
+share/emacs/${VERSION}/etc/images/tree-widget/default/nohandle-guide.xpm
 share/emacs/${VERSION}/etc/images/tree-widget/default/open.png
 share/emacs/${VERSION}/etc/images/tree-widget/default/open.xpm
 share/emacs/${VERSION}/etc/images/tree-widget/folder/
@@ -876,6 +844,8 @@ share/emacs/${VERSION}/etc/images/tree-widget/folder/o
 share/emacs/${VERSION}/etc/images/tree-widget/folder/no-guide.xpm
 share/emacs/${VERSION}/etc/images/tree-widget/folder/no-handle.png
 share/emacs/${VERSION}/etc/images/tree-widget/folder/no-handle.xpm
+share/emacs/${VERSION}/etc/images/tree-widget/folder/nohandle-guide.png
+share/emacs/${VERSION}/etc/images/tree-widget/folder/nohandle-guide.xpm
 share/emacs/${VERSION}/etc/images/tree-widget/folder/open.png
 share/emacs/${VERSION}/etc/images/tree-widget/folder/open.xpm
 share/emacs/${VERSION}/etc/images/unchecked.pbm
@@ -897,6 +867,7 @@ share/emacs/${VERSION}/etc/org/OrgOdtContentTemplate.x
 share/emacs/${VERSION}/etc/nxml/test-invalid.xml
 share/emacs/${VERSION}/etc/nxml/test-valid.xml
 share/emacs/${VERSION}/etc/org/
+share/emacs/${VERSION}/etc/org.gnu.emacs.defaults.gschema.xml
 share/emacs/${VERSION}/etc/org/OrgOdtContentTemplate.xml
 share/emacs/${VERSION}/etc/org/OrgOdtStyles.xml
 share/emacs/${VERSION}/etc/org/README
@@ -1033,6 +1004,7 @@ share/emacs/${VERSION}/etc/themes/leuven-theme.el
 share/emacs/${VERSION}/etc/themes/adwaita-theme.el
 share/emacs/${VERSION}/etc/themes/deeper-blue-theme.el
 share/emacs/${VERSION}/etc/themes/dichromacy-theme.el
+share/emacs/${VERSION}/etc/themes/leuven-dark-theme.el
 share/emacs/${VERSION}/etc/themes/leuven-theme.el
 share/emacs/${VERSION}/etc/themes/light-blue-theme.el
 share/emacs/${VERSION}/etc/themes/manoj-dark-theme.el
@@ -1053,8 +1025,10 @@ share/emacs/${VERSION}/etc/tutorials/TUTORIAL.eo
 share/emacs/${VERSION}/etc/tutorials/TUTORIAL.cn
 share/emacs/${VERSION}/etc/tutorials/TUTORIAL.cs
 share/emacs/${VERSION}/etc/tutorials/TUTORIAL.de
+share/emacs/${VERSION}/etc/tutorials/TUTORIAL.el_GR
 share/emacs/${VERSION}/etc/tutorials/TUTORIAL.eo
 share/emacs/${VERSION}/etc/tutorials/TUTORIAL.es
+share/emacs/${VERSION}/etc/tutorials/TUTORIAL.fa
 share/emacs/${VERSION}/etc/tutorials/TUTORIAL.fr
 share/emacs/${VERSION}/etc/tutorials/TUTORIAL.he
 share/emacs/${VERSION}/etc/tutorials/TUTORIAL.it
@@ -1070,6 +1044,7 @@ share/emacs/${VERSION}/etc/tutorials/TUTORIAL.zh
 share/emacs/${VERSION}/etc/tutorials/TUTORIAL.sv
 share/emacs/${VERSION}/etc/tutorials/TUTORIAL.th
 share/emacs/${VERSION}/etc/tutorials/TUTORIAL.translators
+share/emacs/${VERSION}/etc/tutorials/TUTORIAL.uk
 share/emacs/${VERSION}/etc/tutorials/TUTORIAL.zh
 share/emacs/${VERSION}/etc/w32-feature.el
 share/emacs/${VERSION}/etc/yow.lines
@@ -1086,6 +1061,8 @@ share/emacs/${VERSION}/lisp/apropos.el.gz
 share/emacs/${VERSION}/lisp/allout.elc
 share/emacs/${VERSION}/lisp/ansi-color.el.gz
 share/emacs/${VERSION}/lisp/ansi-color.elc
+share/emacs/${VERSION}/lisp/ansi-osc.el.gz
+share/emacs/${VERSION}/lisp/ansi-osc.elc
 share/emacs/${VERSION}/lisp/apropos.el.gz
 share/emacs/${VERSION}/lisp/apropos.elc
 share/emacs/${VERSION}/lisp/arc-mode.el.gz
@@ -1096,8 +1073,6 @@ share/emacs/${VERSION}/lisp/autoarg.el.gz
 share/emacs/${VERSION}/lisp/auth-source-pass.elc
 share/emacs/${VERSION}/lisp/auth-source.el.gz
 share/emacs/${VERSION}/lisp/auth-source.elc
-share/emacs/${VERSION}/lisp/autoarg.el.gz
-share/emacs/${VERSION}/lisp/autoarg.elc
 share/emacs/${VERSION}/lisp/autoinsert.el.gz
 share/emacs/${VERSION}/lisp/autoinsert.elc
 share/emacs/${VERSION}/lisp/autorevert.el.gz
@@ -1151,7 +1126,8 @@ share/emacs/${VERSION}/lisp/calc/calc-loaddefs.el
 share/emacs/${VERSION}/lisp/calc/calc-keypd.elc
 share/emacs/${VERSION}/lisp/calc/calc-lang.el.gz
 share/emacs/${VERSION}/lisp/calc/calc-lang.elc
-share/emacs/${VERSION}/lisp/calc/calc-loaddefs.el
+share/emacs/${VERSION}/lisp/calc/calc-loaddefs.el.gz
+share/emacs/${VERSION}/lisp/calc/calc-loaddefs.elc
 share/emacs/${VERSION}/lisp/calc/calc-macs.el.gz
 share/emacs/${VERSION}/lisp/calc/calc-macs.elc
 share/emacs/${VERSION}/lisp/calc/calc-map.el.gz
@@ -1229,7 +1205,8 @@ share/emacs/${VERSION}/lisp/calendar/cal-loaddefs.el
 share/emacs/${VERSION}/lisp/calendar/cal-iso.elc
 share/emacs/${VERSION}/lisp/calendar/cal-julian.el.gz
 share/emacs/${VERSION}/lisp/calendar/cal-julian.elc
-share/emacs/${VERSION}/lisp/calendar/cal-loaddefs.el
+share/emacs/${VERSION}/lisp/calendar/cal-loaddefs.el.gz
+share/emacs/${VERSION}/lisp/calendar/cal-loaddefs.elc
 share/emacs/${VERSION}/lisp/calendar/cal-mayan.el.gz
 share/emacs/${VERSION}/lisp/calendar/cal-mayan.elc
 share/emacs/${VERSION}/lisp/calendar/cal-menu.el.gz
@@ -1246,8 +1223,10 @@ share/emacs/${VERSION}/lisp/calendar/diary-loaddefs.el
 share/emacs/${VERSION}/lisp/calendar/calendar.elc
 share/emacs/${VERSION}/lisp/calendar/diary-lib.el.gz
 share/emacs/${VERSION}/lisp/calendar/diary-lib.elc
-share/emacs/${VERSION}/lisp/calendar/diary-loaddefs.el
-share/emacs/${VERSION}/lisp/calendar/hol-loaddefs.el
+share/emacs/${VERSION}/lisp/calendar/diary-loaddefs.el.gz
+share/emacs/${VERSION}/lisp/calendar/diary-loaddefs.elc
+share/emacs/${VERSION}/lisp/calendar/holiday-loaddefs.el.gz
+share/emacs/${VERSION}/lisp/calendar/holiday-loaddefs.elc
 share/emacs/${VERSION}/lisp/calendar/holidays.el.gz
 share/emacs/${VERSION}/lisp/calendar/holidays.elc
 share/emacs/${VERSION}/lisp/calendar/icalendar.el.gz
@@ -1310,7 +1289,8 @@ share/emacs/${VERSION}/lisp/cedet/ede/loaddefs.el
 share/emacs/${VERSION}/lisp/cedet/ede/generic.elc
 share/emacs/${VERSION}/lisp/cedet/ede/linux.el.gz
 share/emacs/${VERSION}/lisp/cedet/ede/linux.elc
-share/emacs/${VERSION}/lisp/cedet/ede/loaddefs.el
+share/emacs/${VERSION}/lisp/cedet/ede/loaddefs.el.gz
+share/emacs/${VERSION}/lisp/cedet/ede/loaddefs.elc
 share/emacs/${VERSION}/lisp/cedet/ede/locate.el.gz
 share/emacs/${VERSION}/lisp/cedet/ede/locate.elc
 share/emacs/${VERSION}/lisp/cedet/ede/make.el.gz
@@ -1473,7 +1453,8 @@ share/emacs/${VERSION}/lisp/cedet/semantic/loaddefs.el
 share/emacs/${VERSION}/lisp/cedet/semantic/lex-spp.elc
 share/emacs/${VERSION}/lisp/cedet/semantic/lex.el.gz
 share/emacs/${VERSION}/lisp/cedet/semantic/lex.elc
-share/emacs/${VERSION}/lisp/cedet/semantic/loaddefs.el
+share/emacs/${VERSION}/lisp/cedet/semantic/loaddefs.el.gz
+share/emacs/${VERSION}/lisp/cedet/semantic/loaddefs.elc
 share/emacs/${VERSION}/lisp/cedet/semantic/mru-bookmark.el.gz
 share/emacs/${VERSION}/lisp/cedet/semantic/mru-bookmark.elc
 share/emacs/${VERSION}/lisp/cedet/semantic/sb.el.gz
@@ -1567,7 +1548,8 @@ share/emacs/${VERSION}/lisp/cedet/srecode/loaddefs.el
 share/emacs/${VERSION}/lisp/cedet/srecode/insert.elc
 share/emacs/${VERSION}/lisp/cedet/srecode/java.el.gz
 share/emacs/${VERSION}/lisp/cedet/srecode/java.elc
-share/emacs/${VERSION}/lisp/cedet/srecode/loaddefs.el
+share/emacs/${VERSION}/lisp/cedet/srecode/loaddefs.el.gz
+share/emacs/${VERSION}/lisp/cedet/srecode/loaddefs.elc
 share/emacs/${VERSION}/lisp/cedet/srecode/map.el.gz
 share/emacs/${VERSION}/lisp/cedet/srecode/map.elc
 share/emacs/${VERSION}/lisp/cedet/srecode/mode.el.gz
@@ -1627,7 +1609,8 @@ share/emacs/${VERSION}/lisp/dired-loaddefs.el
 share/emacs/${VERSION}/lisp/dframe.elc
 share/emacs/${VERSION}/lisp/dired-aux.el.gz
 share/emacs/${VERSION}/lisp/dired-aux.elc
-share/emacs/${VERSION}/lisp/dired-loaddefs.el
+share/emacs/${VERSION}/lisp/dired-loaddefs.el.gz
+share/emacs/${VERSION}/lisp/dired-loaddefs.elc
 share/emacs/${VERSION}/lisp/dired-x.el.gz
 share/emacs/${VERSION}/lisp/dired-x.elc
 share/emacs/${VERSION}/lisp/dired.el.gz
@@ -1675,8 +1658,6 @@ share/emacs/${VERSION}/lisp/emacs-lisp/autoload.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/
 share/emacs/${VERSION}/lisp/emacs-lisp/advice.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/advice.elc
-share/emacs/${VERSION}/lisp/emacs-lisp/autoload.el.gz
-share/emacs/${VERSION}/lisp/emacs-lisp/autoload.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/avl-tree.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/avl-tree.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/backquote.el.gz
@@ -1709,7 +1690,8 @@ share/emacs/${VERSION}/lisp/emacs-lisp/cl-loaddefs.el
 share/emacs/${VERSION}/lisp/emacs-lisp/cl-indent.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/cl-lib.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/cl-lib.elc
-share/emacs/${VERSION}/lisp/emacs-lisp/cl-loaddefs.el
+share/emacs/${VERSION}/lisp/emacs-lisp/cl-loaddefs.el.gz
+share/emacs/${VERSION}/lisp/emacs-lisp/cl-loaddefs.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/cl-macs.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/cl-macs.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/cl-preloaded.el.gz
@@ -1728,6 +1710,8 @@ share/emacs/${VERSION}/lisp/emacs-lisp/debug.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/crm.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/cursor-sensor.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/cursor-sensor.elc
+share/emacs/${VERSION}/lisp/emacs-lisp/debug-early.el.gz
+share/emacs/${VERSION}/lisp/emacs-lisp/debug-early.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/debug.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/debug.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/derived.el.gz
@@ -1742,15 +1726,12 @@ share/emacs/${VERSION}/lisp/emacs-lisp/eieio-compat.el
 share/emacs/${VERSION}/lisp/emacs-lisp/edebug.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/eieio-base.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/eieio-base.elc
-share/emacs/${VERSION}/lisp/emacs-lisp/eieio-compat.el.gz
-share/emacs/${VERSION}/lisp/emacs-lisp/eieio-compat.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/eieio-core.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/eieio-core.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/eieio-custom.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/eieio-custom.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/eieio-datadebug.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/eieio-datadebug.elc
-share/emacs/${VERSION}/lisp/emacs-lisp/eieio-loaddefs.el
 share/emacs/${VERSION}/lisp/emacs-lisp/eieio-opt.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/eieio-opt.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/eieio-speedbar.el.gz
@@ -1775,6 +1756,8 @@ share/emacs/${VERSION}/lisp/emacs-lisp/generator.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/find-func.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/float-sup.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/float-sup.elc
+share/emacs/${VERSION}/lisp/emacs-lisp/generate-lisp-file.el.gz
+share/emacs/${VERSION}/lisp/emacs-lisp/generate-lisp-file.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/generator.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/generator.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/generic.el.gz
@@ -1785,6 +1768,8 @@ share/emacs/${VERSION}/lisp/emacs-lisp/inline.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/helper.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/hierarchy.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/hierarchy.elc
+share/emacs/${VERSION}/lisp/emacs-lisp/icons.el.gz
+share/emacs/${VERSION}/lisp/emacs-lisp/icons.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/inline.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/inline.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/let-alist.el.gz
@@ -1795,6 +1780,8 @@ share/emacs/${VERSION}/lisp/emacs-lisp/macroexp.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/lisp-mode.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/lisp.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/lisp.elc
+share/emacs/${VERSION}/lisp/emacs-lisp/loaddefs-gen.el.gz
+share/emacs/${VERSION}/lisp/emacs-lisp/loaddefs-gen.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/macroexp.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/macroexp.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/map-ynp.el.gz
@@ -1803,8 +1790,14 @@ share/emacs/${VERSION}/lisp/emacs-lisp/nadvice.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/map.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/memory-report.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/memory-report.elc
+share/emacs/${VERSION}/lisp/emacs-lisp/multisession.el.gz
+share/emacs/${VERSION}/lisp/emacs-lisp/multisession.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/nadvice.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/nadvice.elc
+share/emacs/${VERSION}/lisp/emacs-lisp/oclosure.el.gz
+share/emacs/${VERSION}/lisp/emacs-lisp/oclosure.elc
+share/emacs/${VERSION}/lisp/emacs-lisp/package-vc.el.gz
+share/emacs/${VERSION}/lisp/emacs-lisp/package-vc.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/package-x.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/package-x.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/package.el.gz
@@ -1815,6 +1808,8 @@ share/emacs/${VERSION}/lisp/emacs-lisp/re-builder.el.g
 share/emacs/${VERSION}/lisp/emacs-lisp/pp.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/radix-tree.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/radix-tree.elc
+share/emacs/${VERSION}/lisp/emacs-lisp/range.el.gz
+share/emacs/${VERSION}/lisp/emacs-lisp/range.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/re-builder.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/re-builder.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/regexp-opt.el.gz
@@ -1861,6 +1856,8 @@ share/emacs/${VERSION}/lisp/emacs-lisp/warnings.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/trace.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
+share/emacs/${VERSION}/lisp/emacs-lisp/vtable.elc
 share/emacs/${VERSION}/lisp/emacs-lisp/warnings.el.gz
 share/emacs/${VERSION}/lisp/emacs-lisp/warnings.elc
 share/emacs/${VERSION}/lisp/emacs-lock.el.gz
@@ -1927,6 +1924,8 @@ share/emacs/${VERSION}/lisp/erc/erc-compat.el.gz
 share/emacs/${VERSION}/lisp/erc/erc-button.elc
 share/emacs/${VERSION}/lisp/erc/erc-capab.el.gz
 share/emacs/${VERSION}/lisp/erc/erc-capab.elc
+share/emacs/${VERSION}/lisp/erc/erc-common.el.gz
+share/emacs/${VERSION}/lisp/erc/erc-common.elc
 share/emacs/${VERSION}/lisp/erc/erc-compat.el.gz
 share/emacs/${VERSION}/lisp/erc/erc-compat.elc
 share/emacs/${VERSION}/lisp/erc/erc-dcc.el.gz
@@ -1951,7 +1950,8 @@ share/emacs/${VERSION}/lisp/erc/erc-loaddefs.el
 share/emacs/${VERSION}/lisp/erc/erc-lang.elc
 share/emacs/${VERSION}/lisp/erc/erc-list.el.gz
 share/emacs/${VERSION}/lisp/erc/erc-list.elc
-share/emacs/${VERSION}/lisp/erc/erc-loaddefs.el
+share/emacs/${VERSION}/lisp/erc/erc-loaddefs.el.gz
+share/emacs/${VERSION}/lisp/erc/erc-loaddefs.elc
 share/emacs/${VERSION}/lisp/erc/erc-log.el.gz
 share/emacs/${VERSION}/lisp/erc/erc-log.elc
 share/emacs/${VERSION}/lisp/erc/erc-match.el.gz
@@ -1972,6 +1972,8 @@ share/emacs/${VERSION}/lisp/erc/erc-services.el.gz
 share/emacs/${VERSION}/lisp/erc/erc-replace.elc
 share/emacs/${VERSION}/lisp/erc/erc-ring.el.gz
 share/emacs/${VERSION}/lisp/erc/erc-ring.elc
+share/emacs/${VERSION}/lisp/erc/erc-sasl.el.gz
+share/emacs/${VERSION}/lisp/erc/erc-sasl.elc
 share/emacs/${VERSION}/lisp/erc/erc-services.el.gz
 share/emacs/${VERSION}/lisp/erc/erc-services.elc
 share/emacs/${VERSION}/lisp/erc/erc-sound.el.gz
@@ -2003,6 +2005,10 @@ share/emacs/${VERSION}/lisp/eshell/em-glob.el.gz
 share/emacs/${VERSION}/lisp/eshell/em-cmpl.elc
 share/emacs/${VERSION}/lisp/eshell/em-dirs.el.gz
 share/emacs/${VERSION}/lisp/eshell/em-dirs.elc
+share/emacs/${VERSION}/lisp/eshell/em-elecslash.el.gz
+share/emacs/${VERSION}/lisp/eshell/em-elecslash.elc
+share/emacs/${VERSION}/lisp/eshell/em-extpipe.el.gz
+share/emacs/${VERSION}/lisp/eshell/em-extpipe.elc
 share/emacs/${VERSION}/lisp/eshell/em-glob.el.gz
 share/emacs/${VERSION}/lisp/eshell/em-glob.elc
 share/emacs/${VERSION}/lisp/eshell/em-hist.el.gz
@@ -2033,7 +2039,8 @@ share/emacs/${VERSION}/lisp/eshell/esh-groups.el
 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
+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
@@ -2052,6 +2059,8 @@ share/emacs/${VERSION}/lisp/ezimage.el.gz
 share/emacs/${VERSION}/lisp/eshell/eshell.elc
 share/emacs/${VERSION}/lisp/expand.el.gz
 share/emacs/${VERSION}/lisp/expand.elc
+share/emacs/${VERSION}/lisp/external-completion.el.gz
+share/emacs/${VERSION}/lisp/external-completion.elc
 share/emacs/${VERSION}/lisp/ezimage.el.gz
 share/emacs/${VERSION}/lisp/ezimage.elc
 share/emacs/${VERSION}/lisp/face-remap.el.gz
@@ -2184,6 +2193,8 @@ share/emacs/${VERSION}/lisp/gnus/gnus-salt.el.gz
 share/emacs/${VERSION}/lisp/gnus/gnus-registry.elc
 share/emacs/${VERSION}/lisp/gnus/gnus-rfc1843.el.gz
 share/emacs/${VERSION}/lisp/gnus/gnus-rfc1843.elc
+share/emacs/${VERSION}/lisp/gnus/gnus-rmail.el.gz
+share/emacs/${VERSION}/lisp/gnus/gnus-rmail.elc
 share/emacs/${VERSION}/lisp/gnus/gnus-salt.el.gz
 share/emacs/${VERSION}/lisp/gnus/gnus-salt.elc
 share/emacs/${VERSION}/lisp/gnus/gnus-score.el.gz
@@ -2342,14 +2353,14 @@ share/emacs/${VERSION}/lisp/htmlfontify-loaddefs.el
 share/emacs/${VERSION}/lisp/hippie-exp.elc
 share/emacs/${VERSION}/lisp/hl-line.el.gz
 share/emacs/${VERSION}/lisp/hl-line.elc
-share/emacs/${VERSION}/lisp/htmlfontify-loaddefs.el
 share/emacs/${VERSION}/lisp/htmlfontify.el.gz
 share/emacs/${VERSION}/lisp/htmlfontify.elc
 share/emacs/${VERSION}/lisp/ibuf-ext.el.gz
 share/emacs/${VERSION}/lisp/ibuf-ext.elc
 share/emacs/${VERSION}/lisp/ibuf-macs.el.gz
 share/emacs/${VERSION}/lisp/ibuf-macs.elc
-share/emacs/${VERSION}/lisp/ibuffer-loaddefs.el
+share/emacs/${VERSION}/lisp/ibuffer-loaddefs.el.gz
+share/emacs/${VERSION}/lisp/ibuffer-loaddefs.elc
 share/emacs/${VERSION}/lisp/ibuffer.el.gz
 share/emacs/${VERSION}/lisp/ibuffer.elc
 share/emacs/${VERSION}/lisp/icomplete.el.gz
@@ -2361,8 +2372,6 @@ share/emacs/${VERSION}/lisp/image-dired.el.gz
 share/emacs/${VERSION}/lisp/iimage.el.gz
 share/emacs/${VERSION}/lisp/iimage.elc
 share/emacs/${VERSION}/lisp/image/
-share/emacs/${VERSION}/lisp/image-dired.el.gz
-share/emacs/${VERSION}/lisp/image-dired.elc
 share/emacs/${VERSION}/lisp/image-file.el.gz
 share/emacs/${VERSION}/lisp/image-file.elc
 share/emacs/${VERSION}/lisp/image-mode.el.gz
@@ -2377,6 +2386,20 @@ share/emacs/${VERSION}/lisp/imenu.el.gz
 share/emacs/${VERSION}/lisp/image/gravatar.elc
 share/emacs/${VERSION}/lisp/image/image-converter.el.gz
 share/emacs/${VERSION}/lisp/image/image-converter.elc
+share/emacs/${VERSION}/lisp/image/image-crop.el.gz
+share/emacs/${VERSION}/lisp/image/image-crop.elc
+share/emacs/${VERSION}/lisp/image/image-dired-dired.el.gz
+share/emacs/${VERSION}/lisp/image/image-dired-dired.elc
+share/emacs/${VERSION}/lisp/image/image-dired-external.el.gz
+share/emacs/${VERSION}/lisp/image/image-dired-external.elc
+share/emacs/${VERSION}/lisp/image/image-dired-tags.el.gz
+share/emacs/${VERSION}/lisp/image/image-dired-tags.elc
+share/emacs/${VERSION}/lisp/image/image-dired-util.el.gz
+share/emacs/${VERSION}/lisp/image/image-dired-util.elc
+share/emacs/${VERSION}/lisp/image/image-dired.el.gz
+share/emacs/${VERSION}/lisp/image/image-dired.elc
+share/emacs/${VERSION}/lisp/image/wallpaper.el.gz
+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.el.gz
@@ -2399,12 +2422,16 @@ share/emacs/${VERSION}/lisp/international/emoji-zwj.el
 share/emacs/${VERSION}/lisp/international/charscript.elc
 share/emacs/${VERSION}/lisp/international/cp51932.el.gz
 share/emacs/${VERSION}/lisp/international/cp51932.elc
+share/emacs/${VERSION}/lisp/international/emoji-labels.el
 share/emacs/${VERSION}/lisp/international/emoji-zwj.el.gz
 share/emacs/${VERSION}/lisp/international/emoji-zwj.elc
+share/emacs/${VERSION}/lisp/international/emoji.el.gz
+share/emacs/${VERSION}/lisp/international/emoji.elc
 share/emacs/${VERSION}/lisp/international/eucjp-ms.el.gz
 share/emacs/${VERSION}/lisp/international/eucjp-ms.elc
 share/emacs/${VERSION}/lisp/international/fontset.el.gz
 share/emacs/${VERSION}/lisp/international/fontset.elc
+share/emacs/${VERSION}/lisp/international/idna-mapping.el
 share/emacs/${VERSION}/lisp/international/isearch-x.el.gz
 share/emacs/${VERSION}/lisp/international/isearch-x.elc
 share/emacs/${VERSION}/lisp/international/iso-ascii.el.gz
@@ -2443,6 +2470,10 @@ share/emacs/${VERSION}/lisp/international/titdic-cnv.e
 share/emacs/${VERSION}/lisp/international/rfc1843.elc
 share/emacs/${VERSION}/lisp/international/robin.el.gz
 share/emacs/${VERSION}/lisp/international/robin.elc
+share/emacs/${VERSION}/lisp/international/textsec-check.el.gz
+share/emacs/${VERSION}/lisp/international/textsec-check.elc
+share/emacs/${VERSION}/lisp/international/textsec.el.gz
+share/emacs/${VERSION}/lisp/international/textsec.elc
 share/emacs/${VERSION}/lisp/international/titdic-cnv.el.gz
 share/emacs/${VERSION}/lisp/international/titdic-cnv.elc
 share/emacs/${VERSION}/lisp/international/ucs-normalize.el.gz
@@ -2452,6 +2483,7 @@ share/emacs/${VERSION}/lisp/international/uni-decimal.
 share/emacs/${VERSION}/lisp/international/uni-category.el
 share/emacs/${VERSION}/lisp/international/uni-combining.el
 share/emacs/${VERSION}/lisp/international/uni-comment.el
+share/emacs/${VERSION}/lisp/international/uni-confusable.el
 share/emacs/${VERSION}/lisp/international/uni-decimal.el
 share/emacs/${VERSION}/lisp/international/uni-decomposition.el
 share/emacs/${VERSION}/lisp/international/uni-digit.el
@@ -2460,6 +2492,7 @@ share/emacs/${VERSION}/lisp/international/uni-special-
 share/emacs/${VERSION}/lisp/international/uni-name.el
 share/emacs/${VERSION}/lisp/international/uni-numeric.el
 share/emacs/${VERSION}/lisp/international/uni-old-name.el
+share/emacs/${VERSION}/lisp/international/uni-scripts.el
 share/emacs/${VERSION}/lisp/international/uni-special-lowercase.el
 share/emacs/${VERSION}/lisp/international/uni-special-titlecase.el
 share/emacs/${VERSION}/lisp/international/uni-special-uppercase.el
@@ -2485,6 +2518,8 @@ share/emacs/${VERSION}/lisp/kmacro.el.gz
 share/emacs/${VERSION}/lisp/jsonrpc.elc
 share/emacs/${VERSION}/lisp/kermit.el.gz
 share/emacs/${VERSION}/lisp/kermit.elc
+share/emacs/${VERSION}/lisp/keymap.el.gz
+share/emacs/${VERSION}/lisp/keymap.elc
 share/emacs/${VERSION}/lisp/kmacro.el.gz
 share/emacs/${VERSION}/lisp/kmacro.elc
 share/emacs/${VERSION}/lisp/language/
@@ -2522,6 +2557,8 @@ share/emacs/${VERSION}/lisp/language/japan-util.el.gz
 share/emacs/${VERSION}/lisp/language/ind-util.elc
 share/emacs/${VERSION}/lisp/language/indian.el.gz
 share/emacs/${VERSION}/lisp/language/indian.elc
+share/emacs/${VERSION}/lisp/language/indonesian.el.gz
+share/emacs/${VERSION}/lisp/language/indonesian.elc
 share/emacs/${VERSION}/lisp/language/japan-util.el.gz
 share/emacs/${VERSION}/lisp/language/japan-util.elc
 share/emacs/${VERSION}/lisp/language/japanese.el.gz
@@ -2538,6 +2575,8 @@ share/emacs/${VERSION}/lisp/language/pinyin.el.gz
 share/emacs/${VERSION}/lisp/language/lao.elc
 share/emacs/${VERSION}/lisp/language/misc-lang.el.gz
 share/emacs/${VERSION}/lisp/language/misc-lang.elc
+share/emacs/${VERSION}/lisp/language/philippine.el.gz
+share/emacs/${VERSION}/lisp/language/philippine.elc
 share/emacs/${VERSION}/lisp/language/pinyin.el.gz
 share/emacs/${VERSION}/lisp/language/pinyin.elc
 share/emacs/${VERSION}/lisp/language/romanian.el.gz
@@ -2621,6 +2660,8 @@ share/emacs/${VERSION}/lisp/leim/quail/ethiopic.el.gz
 share/emacs/${VERSION}/lisp/leim/quail/cyrillic.elc
 share/emacs/${VERSION}/lisp/leim/quail/czech.el.gz
 share/emacs/${VERSION}/lisp/leim/quail/czech.elc
+share/emacs/${VERSION}/lisp/leim/quail/emoji.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/emoji.elc
 share/emacs/${VERSION}/lisp/leim/quail/ethiopic.el.gz
 share/emacs/${VERSION}/lisp/leim/quail/ethiopic.elc
 share/emacs/${VERSION}/lisp/leim/quail/georgian.el.gz
@@ -2639,6 +2680,8 @@ share/emacs/${VERSION}/lisp/leim/quail/ipa-praat.el.gz
 share/emacs/${VERSION}/lisp/leim/quail/hebrew.elc
 share/emacs/${VERSION}/lisp/leim/quail/indian.el.gz
 share/emacs/${VERSION}/lisp/leim/quail/indian.elc
+share/emacs/${VERSION}/lisp/leim/quail/indonesian.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/indonesian.elc
 share/emacs/${VERSION}/lisp/leim/quail/ipa-praat.el.gz
 share/emacs/${VERSION}/lisp/leim/quail/ipa-praat.elc
 share/emacs/${VERSION}/lisp/leim/quail/ipa.el.gz
@@ -2657,8 +2700,12 @@ share/emacs/${VERSION}/lisp/leim/quail/persian.el.gz
 share/emacs/${VERSION}/lisp/leim/quail/latin-pre.elc
 share/emacs/${VERSION}/lisp/leim/quail/lrt.el.gz
 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/persian.el.gz
 share/emacs/${VERSION}/lisp/leim/quail/persian.elc
+share/emacs/${VERSION}/lisp/leim/quail/philippine.el.gz
+share/emacs/${VERSION}/lisp/leim/quail/philippine.elc
 share/emacs/${VERSION}/lisp/leim/quail/programmer-dvorak.el.gz
 share/emacs/${VERSION}/lisp/leim/quail/programmer-dvorak.elc
 share/emacs/${VERSION}/lisp/leim/quail/py-punct.el.gz
@@ -2701,9 +2748,8 @@ share/emacs/${VERSION}/lisp/linum.el.gz
 share/emacs/${VERSION}/lisp/leim/quail/vnvni.elc
 share/emacs/${VERSION}/lisp/leim/quail/welsh.el.gz
 share/emacs/${VERSION}/lisp/leim/quail/welsh.elc
-share/emacs/${VERSION}/lisp/linum.el.gz
-share/emacs/${VERSION}/lisp/linum.elc
-share/emacs/${VERSION}/lisp/loaddefs.el
+share/emacs/${VERSION}/lisp/loaddefs.el.gz
+share/emacs/${VERSION}/lisp/loaddefs.elc
 share/emacs/${VERSION}/lisp/loadhist.el.gz
 share/emacs/${VERSION}/lisp/loadhist.elc
 share/emacs/${VERSION}/lisp/loadup.el
@@ -2729,6 +2775,8 @@ share/emacs/${VERSION}/lisp/mail/ietf-drums.el.gz
 share/emacs/${VERSION}/lisp/mail/footnote.elc
 share/emacs/${VERSION}/lisp/mail/hashcash.el.gz
 share/emacs/${VERSION}/lisp/mail/hashcash.elc
+share/emacs/${VERSION}/lisp/mail/ietf-drums-date.el.gz
+share/emacs/${VERSION}/lisp/mail/ietf-drums-date.elc
 share/emacs/${VERSION}/lisp/mail/ietf-drums.el.gz
 share/emacs/${VERSION}/lisp/mail/ietf-drums.elc
 share/emacs/${VERSION}/lisp/mail/mail-extr.el.gz
@@ -2765,7 +2813,6 @@ share/emacs/${VERSION}/lisp/mail/rmail-loaddefs.el
 share/emacs/${VERSION}/lisp/mail/rfc6068.elc
 share/emacs/${VERSION}/lisp/mail/rfc822.el.gz
 share/emacs/${VERSION}/lisp/mail/rfc822.elc
-share/emacs/${VERSION}/lisp/mail/rmail-loaddefs.el
 share/emacs/${VERSION}/lisp/mail/rmail-spam-filter.el.gz
 share/emacs/${VERSION}/lisp/mail/rmail-spam-filter.elc
 share/emacs/${VERSION}/lisp/mail/rmail.el.gz
@@ -2790,8 +2837,6 @@ share/emacs/${VERSION}/lisp/mail/uce.el.gz
 share/emacs/${VERSION}/lisp/mail/smtpmail.elc
 share/emacs/${VERSION}/lisp/mail/supercite.el.gz
 share/emacs/${VERSION}/lisp/mail/supercite.elc
-share/emacs/${VERSION}/lisp/mail/uce.el.gz
-share/emacs/${VERSION}/lisp/mail/uce.elc
 share/emacs/${VERSION}/lisp/mail/undigest.el.gz
 share/emacs/${VERSION}/lisp/mail/undigest.elc
 share/emacs/${VERSION}/lisp/mail/unrmail.el.gz
@@ -2800,8 +2845,6 @@ share/emacs/${VERSION}/lisp/makesum.el.gz
 share/emacs/${VERSION}/lisp/mail/uudecode.elc
 share/emacs/${VERSION}/lisp/mail/yenc.el.gz
 share/emacs/${VERSION}/lisp/mail/yenc.elc
-share/emacs/${VERSION}/lisp/makesum.el.gz
-share/emacs/${VERSION}/lisp/makesum.elc
 share/emacs/${VERSION}/lisp/man.el.gz
 share/emacs/${VERSION}/lisp/man.elc
 share/emacs/${VERSION}/lisp/master.el.gz
@@ -2813,15 +2856,14 @@ share/emacs/${VERSION}/lisp/mh-e/mh-acros.el
 share/emacs/${VERSION}/lisp/menu-bar.el.gz
 share/emacs/${VERSION}/lisp/menu-bar.elc
 share/emacs/${VERSION}/lisp/mh-e/
-share/emacs/${VERSION}/lisp/mh-e/mh-acros.el
+share/emacs/${VERSION}/lisp/mh-e/mh-acros.el.gz
+share/emacs/${VERSION}/lisp/mh-e/mh-acros.elc
 share/emacs/${VERSION}/lisp/mh-e/mh-alias.el.gz
 share/emacs/${VERSION}/lisp/mh-e/mh-alias.elc
 share/emacs/${VERSION}/lisp/mh-e/mh-buffers.el.gz
 share/emacs/${VERSION}/lisp/mh-e/mh-buffers.elc
 share/emacs/${VERSION}/lisp/mh-e/mh-comp.el.gz
 share/emacs/${VERSION}/lisp/mh-e/mh-comp.elc
-share/emacs/${VERSION}/lisp/mh-e/mh-compat.el.gz
-share/emacs/${VERSION}/lisp/mh-e/mh-compat.elc
 share/emacs/${VERSION}/lisp/mh-e/mh-e.el.gz
 share/emacs/${VERSION}/lisp/mh-e/mh-e.elc
 share/emacs/${VERSION}/lisp/mh-e/mh-folder.el.gz
@@ -2840,7 +2882,8 @@ share/emacs/${VERSION}/lisp/mh-e/mh-loaddefs.el
 share/emacs/${VERSION}/lisp/mh-e/mh-letter.elc
 share/emacs/${VERSION}/lisp/mh-e/mh-limit.el.gz
 share/emacs/${VERSION}/lisp/mh-e/mh-limit.elc
-share/emacs/${VERSION}/lisp/mh-e/mh-loaddefs.el
+share/emacs/${VERSION}/lisp/mh-e/mh-loaddefs.el.gz
+share/emacs/${VERSION}/lisp/mh-e/mh-loaddefs.elc
 share/emacs/${VERSION}/lisp/mh-e/mh-mime.el.gz
 share/emacs/${VERSION}/lisp/mh-e/mh-mime.elc
 share/emacs/${VERSION}/lisp/mh-e/mh-print.el.gz
@@ -2902,6 +2945,8 @@ share/emacs/${VERSION}/lisp/net/eudc-export.el.gz
 share/emacs/${VERSION}/lisp/net/dns.elc
 share/emacs/${VERSION}/lisp/net/eudc-bob.el.gz
 share/emacs/${VERSION}/lisp/net/eudc-bob.elc
+share/emacs/${VERSION}/lisp/net/eudc-capf.el.gz
+share/emacs/${VERSION}/lisp/net/eudc-capf.elc
 share/emacs/${VERSION}/lisp/net/eudc-export.el.gz
 share/emacs/${VERSION}/lisp/net/eudc-export.elc
 share/emacs/${VERSION}/lisp/net/eudc-hotlist.el.gz
@@ -2912,12 +2957,16 @@ share/emacs/${VERSION}/lisp/net/eudcb-ldap.el.gz
 share/emacs/${VERSION}/lisp/net/eudc.elc
 share/emacs/${VERSION}/lisp/net/eudcb-bbdb.el.gz
 share/emacs/${VERSION}/lisp/net/eudcb-bbdb.elc
+share/emacs/${VERSION}/lisp/net/eudcb-ecomplete.el.gz
+share/emacs/${VERSION}/lisp/net/eudcb-ecomplete.elc
 share/emacs/${VERSION}/lisp/net/eudcb-ldap.el.gz
 share/emacs/${VERSION}/lisp/net/eudcb-ldap.elc
 share/emacs/${VERSION}/lisp/net/eudcb-mab.el.gz
 share/emacs/${VERSION}/lisp/net/eudcb-mab.elc
 share/emacs/${VERSION}/lisp/net/eudcb-macos-contacts.el.gz
 share/emacs/${VERSION}/lisp/net/eudcb-macos-contacts.elc
+share/emacs/${VERSION}/lisp/net/eudcb-mailabbrev.el.gz
+share/emacs/${VERSION}/lisp/net/eudcb-mailabbrev.elc
 share/emacs/${VERSION}/lisp/net/eww.el.gz
 share/emacs/${VERSION}/lisp/net/eww.elc
 share/emacs/${VERSION}/lisp/net/gnutls.el.gz
@@ -2938,8 +2987,6 @@ share/emacs/${VERSION}/lisp/net/netrc.el.gz
 share/emacs/${VERSION}/lisp/net/mairix.elc
 share/emacs/${VERSION}/lisp/net/net-utils.el.gz
 share/emacs/${VERSION}/lisp/net/net-utils.elc
-share/emacs/${VERSION}/lisp/net/netrc.el.gz
-share/emacs/${VERSION}/lisp/net/netrc.elc
 share/emacs/${VERSION}/lisp/net/network-stream.el.gz
 share/emacs/${VERSION}/lisp/net/network-stream.elc
 share/emacs/${VERSION}/lisp/net/newst-backend.el.gz
@@ -2962,14 +3009,10 @@ share/emacs/${VERSION}/lisp/net/quickurl.el.gz
 share/emacs/${VERSION}/lisp/net/pop3.elc
 share/emacs/${VERSION}/lisp/net/puny.el.gz
 share/emacs/${VERSION}/lisp/net/puny.elc
-share/emacs/${VERSION}/lisp/net/quickurl.el.gz
-share/emacs/${VERSION}/lisp/net/quickurl.elc
 share/emacs/${VERSION}/lisp/net/rcirc.el.gz
 share/emacs/${VERSION}/lisp/net/rcirc.elc
 share/emacs/${VERSION}/lisp/net/rfc2104.el.gz
 share/emacs/${VERSION}/lisp/net/rfc2104.elc
-share/emacs/${VERSION}/lisp/net/rlogin.el.gz
-share/emacs/${VERSION}/lisp/net/rlogin.elc
 share/emacs/${VERSION}/lisp/net/sasl-cram.el.gz
 share/emacs/${VERSION}/lisp/net/sasl-cram.elc
 share/emacs/${VERSION}/lisp/net/sasl-digest.el.gz
@@ -3014,6 +3057,8 @@ share/emacs/${VERSION}/lisp/net/tramp-crypt.el.gz
 share/emacs/${VERSION}/lisp/net/tramp-cmds.elc
 share/emacs/${VERSION}/lisp/net/tramp-compat.el.gz
 share/emacs/${VERSION}/lisp/net/tramp-compat.elc
+share/emacs/${VERSION}/lisp/net/tramp-container.el.gz
+share/emacs/${VERSION}/lisp/net/tramp-container.elc
 share/emacs/${VERSION}/lisp/net/tramp-crypt.el.gz
 share/emacs/${VERSION}/lisp/net/tramp-crypt.elc
 share/emacs/${VERSION}/lisp/net/tramp-ftp.el.gz
@@ -3024,7 +3069,8 @@ share/emacs/${VERSION}/lisp/net/tramp-loaddefs.el
 share/emacs/${VERSION}/lisp/net/tramp-gvfs.elc
 share/emacs/${VERSION}/lisp/net/tramp-integration.el.gz
 share/emacs/${VERSION}/lisp/net/tramp-integration.elc
-share/emacs/${VERSION}/lisp/net/tramp-loaddefs.el
+share/emacs/${VERSION}/lisp/net/tramp-loaddefs.el.gz
+share/emacs/${VERSION}/lisp/net/tramp-loaddefs.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
@@ -3099,10 +3145,10 @@ share/emacs/${VERSION}/lisp/obsolete/abbrevlist.el.gz
 share/emacs/${VERSION}/lisp/obarray.el.gz
 share/emacs/${VERSION}/lisp/obarray.elc
 share/emacs/${VERSION}/lisp/obsolete/
-share/emacs/${VERSION}/lisp/obsolete/abbrevlist.el.gz
-share/emacs/${VERSION}/lisp/obsolete/abbrevlist.elc
-share/emacs/${VERSION}/lisp/obsolete/assoc.el.gz
-share/emacs/${VERSION}/lisp/obsolete/assoc.elc
+share/emacs/${VERSION}/lisp/obsolete/autoarg.el.gz
+share/emacs/${VERSION}/lisp/obsolete/autoarg.elc
+share/emacs/${VERSION}/lisp/obsolete/autoload.el.gz
+share/emacs/${VERSION}/lisp/obsolete/autoload.elc
 share/emacs/${VERSION}/lisp/obsolete/bruce.el.gz
 share/emacs/${VERSION}/lisp/obsolete/bruce.elc
 share/emacs/${VERSION}/lisp/obsolete/cc-compat.el.gz
@@ -3111,18 +3157,12 @@ share/emacs/${VERSION}/lisp/obsolete/complete.el.gz
 share/emacs/${VERSION}/lisp/obsolete/cl-compat.elc
 share/emacs/${VERSION}/lisp/obsolete/cl.el.gz
 share/emacs/${VERSION}/lisp/obsolete/cl.elc
-share/emacs/${VERSION}/lisp/obsolete/complete.el.gz
-share/emacs/${VERSION}/lisp/obsolete/complete.elc
 share/emacs/${VERSION}/lisp/obsolete/crisp.el.gz
 share/emacs/${VERSION}/lisp/obsolete/crisp.elc
-share/emacs/${VERSION}/lisp/obsolete/cust-print.el.gz
-share/emacs/${VERSION}/lisp/obsolete/cust-print.elc
-share/emacs/${VERSION}/lisp/obsolete/erc-hecomplete.el.gz
-share/emacs/${VERSION}/lisp/obsolete/erc-hecomplete.elc
+share/emacs/${VERSION}/lisp/obsolete/eieio-compat.el.gz
+share/emacs/${VERSION}/lisp/obsolete/eieio-compat.elc
 share/emacs/${VERSION}/lisp/obsolete/eudcb-ph.el.gz
 share/emacs/${VERSION}/lisp/obsolete/eudcb-ph.elc
-share/emacs/${VERSION}/lisp/obsolete/fast-lock.el.gz
-share/emacs/${VERSION}/lisp/obsolete/fast-lock.elc
 share/emacs/${VERSION}/lisp/obsolete/gs.el.gz
 share/emacs/${VERSION}/lisp/obsolete/gs.elc
 share/emacs/${VERSION}/lisp/obsolete/gulp.el.gz
@@ -3137,12 +3177,12 @@ share/emacs/${VERSION}/lisp/obsolete/lazy-lock.el.gz
 share/emacs/${VERSION}/lisp/obsolete/iswitchb.elc
 share/emacs/${VERSION}/lisp/obsolete/landmark.el.gz
 share/emacs/${VERSION}/lisp/obsolete/landmark.elc
-share/emacs/${VERSION}/lisp/obsolete/lazy-lock.el.gz
-share/emacs/${VERSION}/lisp/obsolete/lazy-lock.elc
+share/emacs/${VERSION}/lisp/obsolete/linum.el.gz
+share/emacs/${VERSION}/lisp/obsolete/linum.elc
 share/emacs/${VERSION}/lisp/obsolete/longlines.el.gz
 share/emacs/${VERSION}/lisp/obsolete/longlines.elc
-share/emacs/${VERSION}/lisp/obsolete/mailpost.el.gz
-share/emacs/${VERSION}/lisp/obsolete/mailpost.elc
+share/emacs/${VERSION}/lisp/obsolete/makesum.el.gz
+share/emacs/${VERSION}/lisp/obsolete/makesum.elc
 share/emacs/${VERSION}/lisp/obsolete/mantemp.el.gz
 share/emacs/${VERSION}/lisp/obsolete/mantemp.elc
 share/emacs/${VERSION}/lisp/obsolete/meese.el.gz
@@ -3150,20 +3190,14 @@ share/emacs/${VERSION}/lisp/obsolete/mouse-sel.el.gz
 share/emacs/${VERSION}/lisp/obsolete/messcompat.el
 share/emacs/${VERSION}/lisp/obsolete/metamail.el.gz
 share/emacs/${VERSION}/lisp/obsolete/metamail.elc
-share/emacs/${VERSION}/lisp/obsolete/mouse-sel.el.gz
-share/emacs/${VERSION}/lisp/obsolete/mouse-sel.elc
+share/emacs/${VERSION}/lisp/obsolete/mh-compat.el.gz
+share/emacs/${VERSION}/lisp/obsolete/mh-compat.elc
+share/emacs/${VERSION}/lisp/obsolete/netrc.el.gz
+share/emacs/${VERSION}/lisp/obsolete/netrc.elc
 share/emacs/${VERSION}/lisp/obsolete/nnir.el.gz
 share/emacs/${VERSION}/lisp/obsolete/nnir.elc
-share/emacs/${VERSION}/lisp/obsolete/old-emacs-lock.el.gz
-share/emacs/${VERSION}/lisp/obsolete/old-emacs-lock.elc
 share/emacs/${VERSION}/lisp/obsolete/otodo-mode.el.gz
 share/emacs/${VERSION}/lisp/obsolete/otodo-mode.elc
-share/emacs/${VERSION}/lisp/obsolete/patcomp.el.gz
-share/emacs/${VERSION}/lisp/obsolete/patcomp.elc
-share/emacs/${VERSION}/lisp/obsolete/pc-mode.el.gz
-share/emacs/${VERSION}/lisp/obsolete/pc-mode.elc
-share/emacs/${VERSION}/lisp/obsolete/pc-select.el.gz
-share/emacs/${VERSION}/lisp/obsolete/pc-select.elc
 share/emacs/${VERSION}/lisp/obsolete/pgg-def.el.gz
 share/emacs/${VERSION}/lisp/obsolete/pgg-def.elc
 share/emacs/${VERSION}/lisp/obsolete/pgg-gpg.el.gz
@@ -3176,22 +3210,26 @@ share/emacs/${VERSION}/lisp/obsolete/rcompile.el.gz
 share/emacs/${VERSION}/lisp/obsolete/pgg-pgp5.elc
 share/emacs/${VERSION}/lisp/obsolete/pgg.el.gz
 share/emacs/${VERSION}/lisp/obsolete/pgg.elc
+share/emacs/${VERSION}/lisp/obsolete/ps-def.el.gz
+share/emacs/${VERSION}/lisp/obsolete/ps-def.elc
+share/emacs/${VERSION}/lisp/obsolete/quickurl.el.gz
+share/emacs/${VERSION}/lisp/obsolete/quickurl.elc
 share/emacs/${VERSION}/lisp/obsolete/rcompile.el.gz
 share/emacs/${VERSION}/lisp/obsolete/rcompile.elc
 share/emacs/${VERSION}/lisp/obsolete/rfc2368.el.gz
 share/emacs/${VERSION}/lisp/obsolete/rfc2368.elc
-share/emacs/${VERSION}/lisp/obsolete/s-region.el.gz
-share/emacs/${VERSION}/lisp/obsolete/s-region.elc
+share/emacs/${VERSION}/lisp/obsolete/rlogin.el.gz
+share/emacs/${VERSION}/lisp/obsolete/rlogin.elc
 share/emacs/${VERSION}/lisp/obsolete/sb-image.el.gz
 share/emacs/${VERSION}/lisp/obsolete/sb-image.elc
-share/emacs/${VERSION}/lisp/obsolete/sregex.el.gz
-share/emacs/${VERSION}/lisp/obsolete/sregex.elc
 share/emacs/${VERSION}/lisp/obsolete/starttls.el.gz
 share/emacs/${VERSION}/lisp/obsolete/starttls.elc
 share/emacs/${VERSION}/lisp/obsolete/sup-mouse.el.gz
 share/emacs/${VERSION}/lisp/obsolete/sup-mouse.elc
 share/emacs/${VERSION}/lisp/obsolete/terminal.el.gz
 share/emacs/${VERSION}/lisp/obsolete/terminal.elc
+share/emacs/${VERSION}/lisp/obsolete/thumbs.el.gz
+share/emacs/${VERSION}/lisp/obsolete/thumbs.elc
 share/emacs/${VERSION}/lisp/obsolete/tls.el.gz
 share/emacs/${VERSION}/lisp/obsolete/tls.elc
 share/emacs/${VERSION}/lisp/obsolete/tpu-edt.el.gz
@@ -3200,14 +3238,26 @@ share/emacs/${VERSION}/lisp/obsolete/url-ns.el.gz
 share/emacs/${VERSION}/lisp/obsolete/tpu-extras.elc
 share/emacs/${VERSION}/lisp/obsolete/tpu-mapper.el.gz
 share/emacs/${VERSION}/lisp/obsolete/tpu-mapper.elc
+share/emacs/${VERSION}/lisp/obsolete/uce.el.gz
+share/emacs/${VERSION}/lisp/obsolete/uce.elc
+share/emacs/${VERSION}/lisp/obsolete/url-about.el.gz
+share/emacs/${VERSION}/lisp/obsolete/url-about.elc
+share/emacs/${VERSION}/lisp/obsolete/url-dired.el.gz
+share/emacs/${VERSION}/lisp/obsolete/url-dired.elc
 share/emacs/${VERSION}/lisp/obsolete/url-ns.el.gz
 share/emacs/${VERSION}/lisp/obsolete/url-ns.elc
 share/emacs/${VERSION}/lisp/obsolete/vc-arch.el.gz
 share/emacs/${VERSION}/lisp/obsolete/vc-arch.elc
+share/emacs/${VERSION}/lisp/obsolete/vc-mtn.el.gz
+share/emacs/${VERSION}/lisp/obsolete/vc-mtn.elc
 share/emacs/${VERSION}/lisp/obsolete/vi.el.gz
 share/emacs/${VERSION}/lisp/obsolete/vi.elc
 share/emacs/${VERSION}/lisp/obsolete/vip.el.gz
 share/emacs/${VERSION}/lisp/obsolete/vip.elc
+share/emacs/${VERSION}/lisp/obsolete/vt-control.el.gz
+share/emacs/${VERSION}/lisp/obsolete/vt-control.elc
+share/emacs/${VERSION}/lisp/obsolete/vt100-led.el.gz
+share/emacs/${VERSION}/lisp/obsolete/vt100-led.elc
 share/emacs/${VERSION}/lisp/obsolete/ws-mode.el.gz
 share/emacs/${VERSION}/lisp/obsolete/ws-mode.elc
 share/emacs/${VERSION}/lisp/obsolete/yow.el.gz
@@ -3315,6 +3365,8 @@ share/emacs/${VERSION}/lisp/org/oc-csl.el.gz
 share/emacs/${VERSION}/lisp/org/oc-basic.elc
 share/emacs/${VERSION}/lisp/org/oc-biblatex.el.gz
 share/emacs/${VERSION}/lisp/org/oc-biblatex.elc
+share/emacs/${VERSION}/lisp/org/oc-bibtex.el.gz
+share/emacs/${VERSION}/lisp/org/oc-bibtex.elc
 share/emacs/${VERSION}/lisp/org/oc-csl.el.gz
 share/emacs/${VERSION}/lisp/org/oc-csl.elc
 share/emacs/${VERSION}/lisp/org/oc-natbib.el.gz
@@ -3369,6 +3421,8 @@ share/emacs/${VERSION}/lisp/org/org-datetree.el.gz
 share/emacs/${VERSION}/lisp/org/org-crypt.elc
 share/emacs/${VERSION}/lisp/org/org-ctags.el.gz
 share/emacs/${VERSION}/lisp/org/org-ctags.elc
+share/emacs/${VERSION}/lisp/org/org-cycle.el.gz
+share/emacs/${VERSION}/lisp/org/org-cycle.elc
 share/emacs/${VERSION}/lisp/org/org-datetree.el.gz
 share/emacs/${VERSION}/lisp/org/org-datetree.elc
 share/emacs/${VERSION}/lisp/org/org-duration.el.gz
@@ -3381,6 +3435,10 @@ share/emacs/${VERSION}/lisp/org/org-footnote.el.gz
 share/emacs/${VERSION}/lisp/org/org-faces.elc
 share/emacs/${VERSION}/lisp/org/org-feed.el.gz
 share/emacs/${VERSION}/lisp/org/org-feed.elc
+share/emacs/${VERSION}/lisp/org/org-fold-core.el.gz
+share/emacs/${VERSION}/lisp/org/org-fold-core.elc
+share/emacs/${VERSION}/lisp/org/org-fold.el.gz
+share/emacs/${VERSION}/lisp/org/org-fold.elc
 share/emacs/${VERSION}/lisp/org/org-footnote.el.gz
 share/emacs/${VERSION}/lisp/org/org-footnote.elc
 share/emacs/${VERSION}/lisp/org/org-goto.el.gz
@@ -3393,14 +3451,14 @@ share/emacs/${VERSION}/lisp/org/org-install.el
 share/emacs/${VERSION}/lisp/org/org-indent.elc
 share/emacs/${VERSION}/lisp/org/org-inlinetask.el.gz
 share/emacs/${VERSION}/lisp/org/org-inlinetask.elc
-share/emacs/${VERSION}/lisp/org/org-install.el
 share/emacs/${VERSION}/lisp/org/org-keys.el.gz
 share/emacs/${VERSION}/lisp/org/org-keys.elc
 share/emacs/${VERSION}/lisp/org/org-lint.el.gz
 share/emacs/${VERSION}/lisp/org/org-lint.elc
 share/emacs/${VERSION}/lisp/org/org-list.el.gz
 share/emacs/${VERSION}/lisp/org/org-list.elc
-share/emacs/${VERSION}/lisp/org/org-loaddefs.el
+share/emacs/${VERSION}/lisp/org/org-loaddefs.el.gz
+share/emacs/${VERSION}/lisp/org/org-loaddefs.elc
 share/emacs/${VERSION}/lisp/org/org-macro.el.gz
 share/emacs/${VERSION}/lisp/org/org-macro.elc
 share/emacs/${VERSION}/lisp/org/org-macs.el.gz
@@ -3413,6 +3471,8 @@ share/emacs/${VERSION}/lisp/org/org-plot.el.gz
 share/emacs/${VERSION}/lisp/org/org-num.elc
 share/emacs/${VERSION}/lisp/org/org-pcomplete.el.gz
 share/emacs/${VERSION}/lisp/org/org-pcomplete.elc
+share/emacs/${VERSION}/lisp/org/org-persist.el.gz
+share/emacs/${VERSION}/lisp/org/org-persist.elc
 share/emacs/${VERSION}/lisp/org/org-plot.el.gz
 share/emacs/${VERSION}/lisp/org/org-plot.elc
 share/emacs/${VERSION}/lisp/org/org-protocol.el.gz
@@ -3464,6 +3524,8 @@ share/emacs/${VERSION}/lisp/pcmpl-gnu.el.gz
 share/emacs/${VERSION}/lisp/password-cache.elc
 share/emacs/${VERSION}/lisp/pcmpl-cvs.el.gz
 share/emacs/${VERSION}/lisp/pcmpl-cvs.elc
+share/emacs/${VERSION}/lisp/pcmpl-git.el.gz
+share/emacs/${VERSION}/lisp/pcmpl-git.elc
 share/emacs/${VERSION}/lisp/pcmpl-gnu.el.gz
 share/emacs/${VERSION}/lisp/pcmpl-gnu.elc
 share/emacs/${VERSION}/lisp/pcmpl-linux.el.gz
@@ -3476,6 +3538,8 @@ share/emacs/${VERSION}/lisp/pixel-scroll.el.gz
 share/emacs/${VERSION}/lisp/pcmpl-x.elc
 share/emacs/${VERSION}/lisp/pcomplete.el.gz
 share/emacs/${VERSION}/lisp/pcomplete.elc
+share/emacs/${VERSION}/lisp/pgtk-dnd.el.gz
+share/emacs/${VERSION}/lisp/pgtk-dnd.elc
 share/emacs/${VERSION}/lisp/pixel-scroll.el.gz
 share/emacs/${VERSION}/lisp/pixel-scroll.elc
 share/emacs/${VERSION}/lisp/play/
@@ -3548,6 +3612,10 @@ share/emacs/${VERSION}/lisp/progmodes/cc-align.el.gz
 share/emacs/${VERSION}/lisp/progmodes/bat-mode.elc
 share/emacs/${VERSION}/lisp/progmodes/bug-reference.el.gz
 share/emacs/${VERSION}/lisp/progmodes/bug-reference.elc
+share/emacs/${VERSION}/lisp/progmodes/c-ts-common.el.gz
+share/emacs/${VERSION}/lisp/progmodes/c-ts-common.elc
+share/emacs/${VERSION}/lisp/progmodes/c-ts-mode.el.gz
+share/emacs/${VERSION}/lisp/progmodes/c-ts-mode.elc
 share/emacs/${VERSION}/lisp/progmodes/cc-align.el.gz
 share/emacs/${VERSION}/lisp/progmodes/cc-align.elc
 share/emacs/${VERSION}/lisp/progmodes/cc-awk.el.gz
@@ -3580,16 +3648,22 @@ share/emacs/${VERSION}/lisp/progmodes/compile.el.gz
 share/emacs/${VERSION}/lisp/progmodes/cl-font-lock.elc
 share/emacs/${VERSION}/lisp/progmodes/cmacexp.el.gz
 share/emacs/${VERSION}/lisp/progmodes/cmacexp.elc
+share/emacs/${VERSION}/lisp/progmodes/cmake-ts-mode.el.gz
+share/emacs/${VERSION}/lisp/progmodes/cmake-ts-mode.elc
 share/emacs/${VERSION}/lisp/progmodes/compile.el.gz
 share/emacs/${VERSION}/lisp/progmodes/compile.elc
 share/emacs/${VERSION}/lisp/progmodes/cperl-mode.el.gz
 share/emacs/${VERSION}/lisp/progmodes/cperl-mode.elc
 share/emacs/${VERSION}/lisp/progmodes/cpp.el.gz
 share/emacs/${VERSION}/lisp/progmodes/cpp.elc
+share/emacs/${VERSION}/lisp/progmodes/csharp-mode.el.gz
+share/emacs/${VERSION}/lisp/progmodes/csharp-mode.elc
 share/emacs/${VERSION}/lisp/progmodes/cwarn.el.gz
 share/emacs/${VERSION}/lisp/progmodes/cwarn.elc
 share/emacs/${VERSION}/lisp/progmodes/dcl-mode.el.gz
 share/emacs/${VERSION}/lisp/progmodes/dcl-mode.elc
+share/emacs/${VERSION}/lisp/progmodes/dockerfile-ts-mode.el.gz
+share/emacs/${VERSION}/lisp/progmodes/dockerfile-ts-mode.elc
 share/emacs/${VERSION}/lisp/progmodes/ebnf-abn.el.gz
 share/emacs/${VERSION}/lisp/progmodes/ebnf-abn.elc
 share/emacs/${VERSION}/lisp/progmodes/ebnf-bnf.el.gz
@@ -3608,8 +3682,12 @@ share/emacs/${VERSION}/lisp/progmodes/elisp-mode.el.gz
 share/emacs/${VERSION}/lisp/progmodes/ebnf2ps.elc
 share/emacs/${VERSION}/lisp/progmodes/ebrowse.el.gz
 share/emacs/${VERSION}/lisp/progmodes/ebrowse.elc
+share/emacs/${VERSION}/lisp/progmodes/eglot.el.gz
+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/erts-mode.el.gz
+share/emacs/${VERSION}/lisp/progmodes/erts-mode.elc
 share/emacs/${VERSION}/lisp/progmodes/etags.el.gz
 share/emacs/${VERSION}/lisp/progmodes/etags.elc
 share/emacs/${VERSION}/lisp/progmodes/executable.el.gz
@@ -3628,6 +3706,8 @@ share/emacs/${VERSION}/lisp/progmodes/grep.el.gz
 share/emacs/${VERSION}/lisp/progmodes/gdb-mi.elc
 share/emacs/${VERSION}/lisp/progmodes/glasses.el.gz
 share/emacs/${VERSION}/lisp/progmodes/glasses.elc
+share/emacs/${VERSION}/lisp/progmodes/go-ts-mode.el.gz
+share/emacs/${VERSION}/lisp/progmodes/go-ts-mode.elc
 share/emacs/${VERSION}/lisp/progmodes/grep.el.gz
 share/emacs/${VERSION}/lisp/progmodes/grep.elc
 share/emacs/${VERSION}/lisp/progmodes/gud.el.gz
@@ -3650,8 +3730,12 @@ share/emacs/${VERSION}/lisp/progmodes/js.el.gz
 share/emacs/${VERSION}/lisp/progmodes/idlwave.elc
 share/emacs/${VERSION}/lisp/progmodes/inf-lisp.el.gz
 share/emacs/${VERSION}/lisp/progmodes/inf-lisp.elc
+share/emacs/${VERSION}/lisp/progmodes/java-ts-mode.el.gz
+share/emacs/${VERSION}/lisp/progmodes/java-ts-mode.elc
 share/emacs/${VERSION}/lisp/progmodes/js.el.gz
 share/emacs/${VERSION}/lisp/progmodes/js.elc
+share/emacs/${VERSION}/lisp/progmodes/json-ts-mode.el.gz
+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/m4-mode.el.gz
@@ -3684,6 +3768,10 @@ share/emacs/${VERSION}/lisp/progmodes/scheme.el.gz
 share/emacs/${VERSION}/lisp/progmodes/python.elc
 share/emacs/${VERSION}/lisp/progmodes/ruby-mode.el.gz
 share/emacs/${VERSION}/lisp/progmodes/ruby-mode.elc
+share/emacs/${VERSION}/lisp/progmodes/ruby-ts-mode.el.gz
+share/emacs/${VERSION}/lisp/progmodes/ruby-ts-mode.elc
+share/emacs/${VERSION}/lisp/progmodes/rust-ts-mode.el.gz
+share/emacs/${VERSION}/lisp/progmodes/rust-ts-mode.elc
 share/emacs/${VERSION}/lisp/progmodes/scheme.el.gz
 share/emacs/${VERSION}/lisp/progmodes/scheme.elc
 share/emacs/${VERSION}/lisp/progmodes/sh-script.el.gz
@@ -3696,6 +3784,8 @@ share/emacs/${VERSION}/lisp/progmodes/vera-mode.el.gz
 share/emacs/${VERSION}/lisp/progmodes/subword.elc
 share/emacs/${VERSION}/lisp/progmodes/tcl.el.gz
 share/emacs/${VERSION}/lisp/progmodes/tcl.elc
+share/emacs/${VERSION}/lisp/progmodes/typescript-ts-mode.el.gz
+share/emacs/${VERSION}/lisp/progmodes/typescript-ts-mode.elc
 share/emacs/${VERSION}/lisp/progmodes/vera-mode.el.gz
 share/emacs/${VERSION}/lisp/progmodes/vera-mode.elc
 share/emacs/${VERSION}/lisp/progmodes/verilog-mode.el.gz
@@ -3710,11 +3800,10 @@ share/emacs/${VERSION}/lisp/ps-def.el.gz
 share/emacs/${VERSION}/lisp/progmodes/xscheme.elc
 share/emacs/${VERSION}/lisp/ps-bdf.el.gz
 share/emacs/${VERSION}/lisp/ps-bdf.elc
-share/emacs/${VERSION}/lisp/ps-def.el.gz
-share/emacs/${VERSION}/lisp/ps-def.elc
 share/emacs/${VERSION}/lisp/ps-mule.el.gz
 share/emacs/${VERSION}/lisp/ps-mule.elc
-share/emacs/${VERSION}/lisp/ps-print-loaddefs.el
+share/emacs/${VERSION}/lisp/ps-print-loaddefs.el.gz
+share/emacs/${VERSION}/lisp/ps-print-loaddefs.elc
 share/emacs/${VERSION}/lisp/ps-print.el.gz
 share/emacs/${VERSION}/lisp/ps-print.elc
 share/emacs/${VERSION}/lisp/ps-samp.el.gz
@@ -3775,6 +3864,10 @@ share/emacs/${VERSION}/lisp/startup.el.gz
 share/emacs/${VERSION}/lisp/soundex.elc
 share/emacs/${VERSION}/lisp/speedbar.el.gz
 share/emacs/${VERSION}/lisp/speedbar.elc
+share/emacs/${VERSION}/lisp/sqlite-mode.el.gz
+share/emacs/${VERSION}/lisp/sqlite-mode.elc
+share/emacs/${VERSION}/lisp/sqlite.el.gz
+share/emacs/${VERSION}/lisp/sqlite.elc
 share/emacs/${VERSION}/lisp/startup.el.gz
 share/emacs/${VERSION}/lisp/startup.elc
 share/emacs/${VERSION}/lisp/strokes.el.gz
@@ -3812,6 +3905,8 @@ share/emacs/${VERSION}/lisp/term/internal.el.gz
 share/emacs/${VERSION}/lisp/term/cygwin.elc
 share/emacs/${VERSION}/lisp/term/fbterm.el.gz
 share/emacs/${VERSION}/lisp/term/fbterm.elc
+share/emacs/${VERSION}/lisp/term/haiku-win.el.gz
+share/emacs/${VERSION}/lisp/term/haiku-win.elc
 share/emacs/${VERSION}/lisp/term/internal.el.gz
 share/emacs/${VERSION}/lisp/term/internal.elc
 share/emacs/${VERSION}/lisp/term/iris-ansi.el.gz
@@ -3828,6 +3923,8 @@ share/emacs/${VERSION}/lisp/term/rxvt.el.gz
 share/emacs/${VERSION}/lisp/term/ns-win.elc
 share/emacs/${VERSION}/lisp/term/pc-win.el.gz
 share/emacs/${VERSION}/lisp/term/pc-win.elc
+share/emacs/${VERSION}/lisp/term/pgtk-win.el.gz
+share/emacs/${VERSION}/lisp/term/pgtk-win.elc
 share/emacs/${VERSION}/lisp/term/rxvt.el.gz
 share/emacs/${VERSION}/lisp/term/rxvt.elc
 share/emacs/${VERSION}/lisp/term/screen.el.gz
@@ -3871,14 +3968,18 @@ share/emacs/${VERSION}/lisp/textmodes/enriched.el.gz
 share/emacs/${VERSION}/lisp/textmodes/css-mode.elc
 share/emacs/${VERSION}/lisp/textmodes/dns-mode.el.gz
 share/emacs/${VERSION}/lisp/textmodes/dns-mode.elc
+share/emacs/${VERSION}/lisp/textmodes/emacs-authors-mode.el.gz
+share/emacs/${VERSION}/lisp/textmodes/emacs-authors-mode.elc
+share/emacs/${VERSION}/lisp/textmodes/emacs-news-mode.el.gz
+share/emacs/${VERSION}/lisp/textmodes/emacs-news-mode.elc
 share/emacs/${VERSION}/lisp/textmodes/enriched.el.gz
 share/emacs/${VERSION}/lisp/textmodes/enriched.elc
-share/emacs/${VERSION}/lisp/textmodes/etc-authors-mode.el.gz
-share/emacs/${VERSION}/lisp/textmodes/etc-authors-mode.elc
 share/emacs/${VERSION}/lisp/textmodes/fill.el.gz
 share/emacs/${VERSION}/lisp/textmodes/fill.elc
 share/emacs/${VERSION}/lisp/textmodes/flyspell.el.gz
 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/ispell.el.gz
 share/emacs/${VERSION}/lisp/textmodes/ispell.elc
 share/emacs/${VERSION}/lisp/textmodes/less-css-mode.el.gz
@@ -3897,6 +3998,8 @@ share/emacs/${VERSION}/lisp/textmodes/po.el.gz
 share/emacs/${VERSION}/lisp/textmodes/paragraphs.elc
 share/emacs/${VERSION}/lisp/textmodes/picture.el.gz
 share/emacs/${VERSION}/lisp/textmodes/picture.elc
+share/emacs/${VERSION}/lisp/textmodes/pixel-fill.el.gz
+share/emacs/${VERSION}/lisp/textmodes/pixel-fill.elc
 share/emacs/${VERSION}/lisp/textmodes/po.el.gz
 share/emacs/${VERSION}/lisp/textmodes/po.elc
 share/emacs/${VERSION}/lisp/textmodes/refbib.el.gz
@@ -3915,7 +4018,8 @@ share/emacs/${VERSION}/lisp/textmodes/reftex-loaddefs.
 share/emacs/${VERSION}/lisp/textmodes/reftex-global.elc
 share/emacs/${VERSION}/lisp/textmodes/reftex-index.el.gz
 share/emacs/${VERSION}/lisp/textmodes/reftex-index.elc
-share/emacs/${VERSION}/lisp/textmodes/reftex-loaddefs.el
+share/emacs/${VERSION}/lisp/textmodes/reftex-loaddefs.el.gz
+share/emacs/${VERSION}/lisp/textmodes/reftex-loaddefs.elc
 share/emacs/${VERSION}/lisp/textmodes/reftex-parse.el.gz
 share/emacs/${VERSION}/lisp/textmodes/reftex-parse.elc
 share/emacs/${VERSION}/lisp/textmodes/reftex-ref.el.gz
@@ -3934,13 +4038,16 @@ share/emacs/${VERSION}/lisp/textmodes/table.el.gz
 share/emacs/${VERSION}/lisp/textmodes/rst.elc
 share/emacs/${VERSION}/lisp/textmodes/sgml-mode.el.gz
 share/emacs/${VERSION}/lisp/textmodes/sgml-mode.elc
+share/emacs/${VERSION}/lisp/textmodes/string-edit.el.gz
+share/emacs/${VERSION}/lisp/textmodes/string-edit.elc
 share/emacs/${VERSION}/lisp/textmodes/table.el.gz
 share/emacs/${VERSION}/lisp/textmodes/table.elc
 share/emacs/${VERSION}/lisp/textmodes/tex-mode.el.gz
 share/emacs/${VERSION}/lisp/textmodes/tex-mode.elc
 share/emacs/${VERSION}/lisp/textmodes/texinfmt.el.gz
 share/emacs/${VERSION}/lisp/textmodes/texinfmt.elc
-share/emacs/${VERSION}/lisp/textmodes/texinfo-loaddefs.el
+share/emacs/${VERSION}/lisp/textmodes/texinfo-loaddefs.el.gz
+share/emacs/${VERSION}/lisp/textmodes/texinfo-loaddefs.elc
 share/emacs/${VERSION}/lisp/textmodes/texinfo.el.gz
 share/emacs/${VERSION}/lisp/textmodes/texinfo.elc
 share/emacs/${VERSION}/lisp/textmodes/texnfo-upd.el.gz
@@ -3949,16 +4056,21 @@ share/emacs/${VERSION}/lisp/textmodes/two-column.el.gz
 share/emacs/${VERSION}/lisp/textmodes/text-mode.elc
 share/emacs/${VERSION}/lisp/textmodes/tildify.el.gz
 share/emacs/${VERSION}/lisp/textmodes/tildify.elc
+share/emacs/${VERSION}/lisp/textmodes/toml-ts-mode.el.gz
+share/emacs/${VERSION}/lisp/textmodes/toml-ts-mode.elc
 share/emacs/${VERSION}/lisp/textmodes/two-column.el.gz
 share/emacs/${VERSION}/lisp/textmodes/two-column.elc
 share/emacs/${VERSION}/lisp/textmodes/underline.el.gz
 share/emacs/${VERSION}/lisp/textmodes/underline.elc
+share/emacs/${VERSION}/lisp/textmodes/word-wrap-mode.el.gz
+share/emacs/${VERSION}/lisp/textmodes/word-wrap-mode.elc
+share/emacs/${VERSION}/lisp/textmodes/yaml-ts-mode.el.gz
+share/emacs/${VERSION}/lisp/textmodes/yaml-ts-mode.elc
+share/emacs/${VERSION}/lisp/theme-loaddefs.el
 share/emacs/${VERSION}/lisp/thingatpt.el.gz
 share/emacs/${VERSION}/lisp/thingatpt.elc
 share/emacs/${VERSION}/lisp/thread.el.gz
 share/emacs/${VERSION}/lisp/thread.elc
-share/emacs/${VERSION}/lisp/thumbs.el.gz
-share/emacs/${VERSION}/lisp/thumbs.elc
 share/emacs/${VERSION}/lisp/time-stamp.el.gz
 share/emacs/${VERSION}/lisp/time-stamp.elc
 share/emacs/${VERSION}/lisp/time.el.gz
@@ -3975,6 +4087,8 @@ share/emacs/${VERSION}/lisp/tutorial.el.gz
 share/emacs/${VERSION}/lisp/transient.elc
 share/emacs/${VERSION}/lisp/tree-widget.el.gz
 share/emacs/${VERSION}/lisp/tree-widget.elc
+share/emacs/${VERSION}/lisp/treesit.el.gz
+share/emacs/${VERSION}/lisp/treesit.elc
 share/emacs/${VERSION}/lisp/tutorial.el.gz
 share/emacs/${VERSION}/lisp/tutorial.elc
 share/emacs/${VERSION}/lisp/type-break.el.gz
@@ -3982,8 +4096,6 @@ share/emacs/${VERSION}/lisp/url/url-about.el.gz
 share/emacs/${VERSION}/lisp/uniquify.el.gz
 share/emacs/${VERSION}/lisp/uniquify.elc
 share/emacs/${VERSION}/lisp/url/
-share/emacs/${VERSION}/lisp/url/url-about.el.gz
-share/emacs/${VERSION}/lisp/url/url-about.elc
 share/emacs/${VERSION}/lisp/url/url-auth.el.gz
 share/emacs/${VERSION}/lisp/url/url-auth.elc
 share/emacs/${VERSION}/lisp/url/url-cache.el.gz
@@ -3994,8 +4106,6 @@ share/emacs/${VERSION}/lisp/url/url-dired.el.gz
 share/emacs/${VERSION}/lisp/url/url-cookie.elc
 share/emacs/${VERSION}/lisp/url/url-dav.el.gz
 share/emacs/${VERSION}/lisp/url/url-dav.elc
-share/emacs/${VERSION}/lisp/url/url-dired.el.gz
-share/emacs/${VERSION}/lisp/url/url-dired.elc
 share/emacs/${VERSION}/lisp/url/url-domsuf.el.gz
 share/emacs/${VERSION}/lisp/url/url-domsuf.elc
 share/emacs/${VERSION}/lisp/url/url-expand.el.gz
@@ -4046,6 +4156,27 @@ share/emacs/${VERSION}/lisp/userlock.el.gz
 share/emacs/${VERSION}/lisp/url/url-vars.elc
 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
+share/emacs/${VERSION}/lisp/use-package/use-package-core.elc
+share/emacs/${VERSION}/lisp/use-package/use-package-delight.el.gz
+share/emacs/${VERSION}/lisp/use-package/use-package-delight.elc
+share/emacs/${VERSION}/lisp/use-package/use-package-diminish.el.gz
+share/emacs/${VERSION}/lisp/use-package/use-package-diminish.elc
+share/emacs/${VERSION}/lisp/use-package/use-package-ensure-system-package.el.gz
+share/emacs/${VERSION}/lisp/use-package/use-package-ensure-system-package.elc
+share/emacs/${VERSION}/lisp/use-package/use-package-ensure.el.gz
+share/emacs/${VERSION}/lisp/use-package/use-package-ensure.elc
+share/emacs/${VERSION}/lisp/use-package/use-package-jump.el.gz
+share/emacs/${VERSION}/lisp/use-package/use-package-jump.elc
+share/emacs/${VERSION}/lisp/use-package/use-package-lint.el.gz
+share/emacs/${VERSION}/lisp/use-package/use-package-lint.elc
+share/emacs/${VERSION}/lisp/use-package/use-package.el.gz
+share/emacs/${VERSION}/lisp/use-package/use-package.elc
 share/emacs/${VERSION}/lisp/userlock.el.gz
 share/emacs/${VERSION}/lisp/userlock.elc
 share/emacs/${VERSION}/lisp/vc/
@@ -4119,8 +4250,6 @@ share/emacs/${VERSION}/lisp/vc/vc-mtn.el.gz
 share/emacs/${VERSION}/lisp/vc/vc-hg.elc
 share/emacs/${VERSION}/lisp/vc/vc-hooks.el.gz
 share/emacs/${VERSION}/lisp/vc/vc-hooks.elc
-share/emacs/${VERSION}/lisp/vc/vc-mtn.el.gz
-share/emacs/${VERSION}/lisp/vc/vc-mtn.elc
 share/emacs/${VERSION}/lisp/vc/vc-rcs.el.gz
 share/emacs/${VERSION}/lisp/vc/vc-rcs.elc
 share/emacs/${VERSION}/lisp/vc/vc-sccs.el.gz
@@ -4137,10 +4266,6 @@ share/emacs/${VERSION}/lisp/vt-control.el.gz
 share/emacs/${VERSION}/lisp/version.elc
 share/emacs/${VERSION}/lisp/view.el.gz
 share/emacs/${VERSION}/lisp/view.elc
-share/emacs/${VERSION}/lisp/vt-control.el.gz
-share/emacs/${VERSION}/lisp/vt-control.elc
-share/emacs/${VERSION}/lisp/vt100-led.el.gz
-share/emacs/${VERSION}/lisp/vt100-led.elc
 share/emacs/${VERSION}/lisp/w32-fns.el.gz
 share/emacs/${VERSION}/lisp/w32-fns.elc
 share/emacs/${VERSION}/lisp/w32-vars.el.gz
@@ -4173,9 +4298,10 @@ share/emacs/${VERSION}/site-lisp/
 share/emacs/${VERSION}/lisp/xt-mouse.elc
 share/emacs/${VERSION}/lisp/xwidget.el.gz
 share/emacs/${VERSION}/lisp/xwidget.elc
+share/emacs/${VERSION}/lisp/yank-media.el.gz
+share/emacs/${VERSION}/lisp/yank-media.elc
 share/emacs/${VERSION}/site-lisp/
 share/emacs/${VERSION}/site-lisp/subdirs.el
-share/emacs/site-lisp/
 share/emacs/site-lisp/subdirs.el
 share/metainfo/
 share/metainfo/emacs.metainfo.xml