Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

10 files changed, 375 insertions, 62 deletions

diff --git a/ChangeLog.5 b/ChangeLog.5
index c74daeb3aed..4f27baa2d22 100644
--- a/ChangeLog.5
+++ b/ChangeLog.5
@@ -1,3 +1,306 @@
+2025-08-14  Eli Zaretskii  <eliz@maintain0p.gnu.org>
+
+        * Version 30.2 released.
+
+2025-08-14  Eli Zaretskii  <eliz@maintain0p.gnu.org>
+
+        * README:
+        * configure.ac:
+        * exec/configure.ac:
+        * java/AndroidManifest.xml.in (Version-code):
+        * nt/README.W32:
+        * msdos/sed2v2.inp: Bump Emacs version to 30.2.
+
+        * ChangeLog.5:
+        * etc/AUTHORS:
+        * etc/HISTORY: Update for Emacs 30.2.
+
+        * admin/admin.el (set-version): Fix handling of official releases.
+
+2025-08-07  Vinícius Moraes  <vinicius.moraes@eternodevir.com>  (tiny change)
+
+        Handle remote file names in cmuscheme.el
+
+        * lisp/cmuscheme.el (scheme-load-file, scheme-compile-file): Use
+        'file-local-name' to handle file names on remote systems.
+        (Bug#79163)
+
+2025-08-06  Sean Whitton  <spwhitton@spwhitton.name>
+
+        * lisp/vc/vc.el (vc-register): Fix interactive spec (bug#79183).
+
+2025-07-31  James Thomas  <jimjoe@gmx.net>
+
+        * doc/misc/gnus.texi (Category Syntax): Update gnus-agent-predicate.
+
+        This updates the Gnus manual due to recent code change (bug#79123).
+
+2025-07-28  Robert Pluim  <rpluim@gmail.com>
+
+        Prefer "tls" to "ssl" in documentation
+
+        * doc/misc/gnus.texi (NNTP): Refer to 'nntp-open-tls-stream'.
+        (Direct Functions, Customizing the IMAP Connection): Add
+        commentary about desirability of STARTTLS.  Correct
+        documentation about use of GnuTLS.  Use 'tls in example.
+        * lisp/gnus/nnimap.el (nnimap-server-port): Mention 'tls in
+        preference to 'ssl.
+        * lisp/gnus/nntp.el (nntp-open-connection-function)
+        (nntp-never-echoes-commands): Document 'nntp-open-tls-stream' as
+        preferred to 'nntp-open-ssl-stream'.
+
+2025-07-26  Sean Whitton  <spwhitton@spwhitton.name>
+
+        loaddefs-generate--rubric: Note about committing ldefs-boot.el
+
+        * lisp/emacs-lisp/loaddefs-gen.el (loaddefs-generate--rubric):
+        Note that ldefs-boot.el should be committed on its own.
+
+2025-07-21  Jim Porter  <jporterbugs@gmail.com>
+
+        Fix Eshell call to 'string-suffix-p' when checking for trailing newline
+
+        * lisp/eshell/esh-io.el (eshell--output-maybe-n): Fix call.
+
+        * test/lisp/eshell/esh-io-tests.el
+        (esh-io-test/output-newline/add-newline)
+        (esh-io-test/output-newline/no-newline)
+        (esh-io-test/output-newline/no-extra-newline): New tests (bug#79063).
+
+2025-07-21  Robert Pluim  <rpluim@gmail.com>
+
+        * etc/PROBLEMS: Describe how to work around screen reader TAB issue
+
+2025-07-21  Sean Whitton  <spwhitton@spwhitton.name>
+
+        (gnus)Scoring Tips: New tip regarding header continuation lines
+
+        * doc/misc/gnus.texi (Scoring Tips): New "Continuation lines
+        when scoring on other headers" tip.
+
+2025-07-16  Ken Mankoff  <mankoff@gmail.com>
+
+        Fix :box attribute of faces in Leuven themes.
+
+        * etc/themes/leuven-dark-theme.el:
+        * etc/themes/leuven-theme.el: Fix 'lui-highlight-face' face.
+        (Bug#79029)
+
+2025-07-09  Andrea Corallo  <acorallo@gnu.org>
+
+        Nativecomp don't error with undeclared types (bug#6573) (don't merge)
+
+        Backporting f38e969e472 from trunk to emacs-30
+
+        * test/src/comp-resources/comp-test-funcs.el (comp-test-76573-1-f): New
+        function.
+        * lisp/emacs-lisp/comp-cstr.el (comp-supertypes): Don't error if 'type'
+        is unknown.
+
+2025-07-06  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix 'kill-ring-deindent-mode'
+
+        * lisp/indent-aux.el
+        (kill-ring-deindent-buffer-substring-function): Fix deindenting
+        for modes which set 'indent-tab-mode' to nil.  (Bug#77981)
+
+        (cherry picked from commit 1c7fe501fedb41aaf5b22d82dab5a365f86e4c85)
+
+2025-07-04  Yuan Fu  <casouri@gmail.com>
+
+        Handle ts_node_type return NULL (bug#78938)
+
+        * src/treesit.c (treesit_traverse_match_predicate): Handle the
+        case when ts_node_type returns NULL.
+        (Ftreesit_node_type): Add some comment.
+
+2025-07-04  Eli Zaretskii  <eliz@gnu.org>
+
+        Improve documentation of 'warning-display-at-bottom'
+
+        * lisp/emacs-lisp/warnings.el (warning-display-at-bottom):
+        * doc/lispref/display.texi (Warning Options):
+        * doc/emacs/windows.texi (Temporary Displays):
+        * etc/NEWS: Improve documentation of 'warning-display-at-bottom'.
+        See https://lists.gnu.org/archive/html/emacs-devel/2025-07/msg00024.html
+        for more details.
+
+2025-07-04  Yuan Fu  <casouri@gmail.com>
+
+        Handle the case when ts_node_type returns NULL (bug#78938)
+
+        * src/treesit.c (Ftreesit_node_type): Handle NULL.
+
+2025-06-29  Jim Porter  <jporterbugs@gmail.com>
+
+        Populate the ':title' in EWW when defaulting to readable mode
+
+        Do not merge to master.
+
+        * lisp/net/eww.el (eww-display-document): Always render the full
+        document first to populate ':title' (bug#77299).
+
+2025-06-28  Liam Hupfer  <liam@hpfr.net>
+
+        bug#78901: [PATCH] js-ts-mode: Fix auto-mode-alist regexp
+
+        Align the js-ts-mode entry with the javascript-mode entries in the
+        default auto-mode-alist value in lisp/files.el. Otherwise, js-ts-mode is
+        not associated with .js files.
+
+        * lisp/progmodes/js.el (js-ts-mode): Fix auto-mode-alist regexp.
+
+        Fixes: 2023-01-20 6b2f85caa6ca "Make tree-sitter based modes optional"
+
+2025-06-25  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix 'insert-directory' in Turkish language-environment
+
+        * lisp/files.el (insert-directory-clean, insert-directory): Use
+        case-sensitive search for "//DIRED//" and similar strings.
+        (Bug#78894)
+
+2025-06-25  Michael Albinus  <michael.albinus@gmx.de>
+
+        Fix job control in remote shell
+
+        * lisp/net/tramp-sh.el (tramp-methods) <rsync>:
+        Adapt `tramp-direct-async' argument.  (Bug#71050, Bug#71259)
+
+2025-06-21  Eli Zaretskii  <eliz@gnu.org>
+
+        Workaround for "M-x man" on macOS 15 and later
+
+        * lisp/man.el (Man-init-defvars): Workaround for macOS Sed.  Do
+        not merge to master.  (Bug#77944)
+
+2025-06-11  Sean Whitton  <spwhitton@spwhitton.name>
+
+        Insert missing step to make use of directory tracking OSC codes
+
+        * doc/emacs/misc.texi (Interactive Shell): Say to add
+        comint-osc-process-output to comint-output-filter-function.
+
+2025-06-11  Robert Pluim  <rpluim@gmail.com>
+
+        * lisp/keymap.el (keymap-set): Refer to 'key-description'.  (Bug#78714)
+
+2025-06-11  Yuan Fu  <casouri@gmail.com>
+
+        Support new tree-sitter grammar filename format (bug#78754)
+
+        Previously Emacs only looks for filenames like
+        libtree-sitter-json.so.0.0.  Now Emacs also look for filenames
+        like libtree-sitter-json.so.15.0.
+
+        * src/treesit.c:
+        (treesit_load_language_push_for_each_suffix): Add versioned
+        candidate to candidate list too.
+
+2025-06-10  Pip Cet  <pipcet@protonmail.com>
+
+        Fix crash when evaluating "(signal nil 5)" (bug#78738)
+
+        The docstring already warns against calling signal with a nil
+        error symbol, which is for internal use only, but we can avoid crashing
+        in this case.
+
+        * src/eval.c (Fsignal): Produce a "peculiar error" for more arguments
+        involving non-lists.
+
+2025-06-08  Michael Albinus  <michael.albinus@gmx.de>
+
+        Adapt emba integration (don't merge)
+
+        * test/infra/Dockerfile.emba (emacs-inotify): Don't install clangd.
+
+        * test/infra/gitlab-ci.yml (.job-template): Make actions in
+        after_script more robust.
+
+2025-06-03  Xiyue Deng  <manphiz@gmail.com>
+
+        Make xoauth2 auth fail when a smtp server replies 334 (Bug#78366)
+
+        * lisp/mail/smtpmail.el (smtpmail-try-auth-method): Throw error 535
+        when receiving a "334 server challenge" reply.
+
+        (cherry picked from commit 53371c959462a677a29ee869b3b6627facf3ed79)
+
+2025-05-31  Eli Zaretskii  <eliz@gnu.org>
+
+        Revert "; * lisp/subr.el (setq-local): Doc fix (bug#78644)."
+
+        This reverts commit cb9556d669c037c4e2f1a9c80adacad55948c706.
+        Some of its parts were not supposed to be installed.
+
+2025-05-28  Stephen Berman  <stephen.berman@gmx.net>
+
+        Fix bug in 'todo-jump-to-category' (bug#78608)
+
+        * lisp/calendar/todo-mode.el (todo-jump-to-category): Eliminate
+        comparison of the number of Todo categories before and after
+        specifying the category to jump to and replace it by a check of
+        whether there are any items in the category, since an existing
+        category should always have at least one item (perhaps done or
+        archived).
+
+2025-05-27  Michael Albinus  <michael.albinus@gmx.de>
+
+        Fix gitlab-ci.yml (don't merge to master)
+
+        * test/infra/gitlab-ci.yml (.job-template): Fix config.log name.
+        (test-filenotify-gio, test-eglot): Fix formatting.
+
+2025-05-25  Konstantin Kharlamov  <Hi-Angel@yandex.ru>
+
+        typescript-ts-mode: Improve function body indentation (bug#78121)
+
+        Older code was calculating body indentation depending on function
+        parameters alignment.  This is incorrect, because if parameters are
+        misaligned, so will the function body.  Instead, use offset of the
+        previous standalone parent.
+
+        * lisp/progmodes/typescript-ts-mode.el:
+        (typescript-ts-mode--indent-rules): Stop depending on function
+        parameters indentation for calculating body content and the closing
+        `}'.
+        * test/lisp/progmodes/typescript-ts-mode-resources/indent.erts:
+        (Function body with params misindented (bug#78121)): Add new test.
+
+2025-05-24  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix documentation of use-package's ':hook' keyword
+
+        * doc/misc/use-package.texi (Hooks): Document how to add several
+        functions to the same hook (bug#77609).
+
+2025-05-22  Michael Albinus  <michael.albinus@gmx.de>
+
+        * test/infra/gitlab-ci.yml (.job-template): Make it more robust.
+
+2025-05-20  Stephen Berman  <stephen.berman@gmx.net>
+
+        Fix todo-mode item insertion bug (bug#78506)
+
+        * lisp/calendar/todo-mode.el (todo-insert-item--next-param): Unset
+        transient keymap on completing default or copy item insertion
+        command, to ensure that the next Todo mode key is recognized.
+
+2025-05-19  Jostein Kjønigsen  <jostein@kjonigsen.net>
+
+        Add support for Pyrefly LSP for Python
+
+        * lisp/progmodes/eglot.el (eglot-server-programs): Add config
+        for Pyrefly.  (Bug#78492)
+
+2025-05-18  Michael Albinus  <michael.albinus@gmx.de>
+
+        Adapt Tramp version in customize-package-emacs-version-alist
+
+        * lisp/net/trampver.el (customize-package-emacs-version-alist):
+        Add Tramp version integrated in Emacs 30.1.
+
 2025-05-17  Eli Zaretskii  <eliz@gnu.org>
 
         Fix saving abbrevs by 'abbrev-edit-save-buffer'
@@ -1157,7 +1460,7 @@
 
 This file records repository revisions from
 commit 1cda0967b4d3c815fc610794ad6a8fc2b913a3c5 (exclusive) to
-commit 299d3a440121ff6692a85615ff97e6ad4dde91db (inclusive).
+commit 49d64bfb1a4ca5fc8b3a4d215fb6cabbb9780f9b (inclusive).
 See ChangeLog.4 for earlier changes.
 
 ;; Local Variables:
diff --git a/admin/admin.el b/admin/admin.el
index 542556a65e0..7e761c3f1f4 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -128,8 +128,13 @@ Root must be the root of an Emacs source tree."
                                 (submatch (1+ (in "0-9."))))))
   (set-version-in-file root "java/AndroidManifest.xml.in"
                        (apply #'format "%02d%02d%02d000"
-                              (mapcar #'string-to-number
-                                      (split-string version "\\.")))
+                              (let ((ver-list
+                                     (mapcar #'string-to-number
+                                             (split-string version "\\."))))
+                                ;; Official releases are XX.YY, not XX.YY.ZZ
+                                (if (= 2 (length ver-list))
+                                    (setq ver-list (append ver-list '(0))))
+                                ver-list))
                        admin-android-version-code-regexp)
   (set-version-in-file root "nt/README.W32" version
                        (rx (and "version" (1+ space)
diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index 22e76a0ac2e..61d19e54b8e 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -388,9 +388,9 @@ add the new NEWS file as news/NEWS.xx.y
 Copy new etc/MACHINES to MACHINES and CONTRIBUTE to CONTRIBUTE
 
 For every new release, a banner is displayed on top of the emacs.html
-page.  Uncomment and the release banner in emacs.html.  Keep it on the
-page for about a month, then comment it again.  The new release banner
-looks like this:
+page.  Uncomment the release banner in emacs.html.  Keep it on the page
+for about a month, then comment it again.  The new release banner looks
+like this:
 
     <div class="release-banner">
         <div class="container">
@@ -398,6 +398,16 @@ looks like this:
         </div>
     </div>
 
+Add the information about the new release in the "Releases" section of
+emacs.html, which begins like this:
+
+    <div class="releases">
+        <div class="container">
+          <!-- NOTE: There is no need to keep more than the two most recent -->
+          <!-- major versions here. -->
+
+            <h2 id="Releases">
+
 Also, make sure the copyright years at the bottom of emacs.html are
 up-to-date.
 
diff --git a/etc/AUTHORS b/etc/AUTHORS
index 9d289f0edf8..ff7c2cc4ee6 100644
--- a/etc/AUTHORS
+++ b/etc/AUTHORS
@@ -304,7 +304,7 @@ Anders Waldenborg: changed emacsclient.c
 Andrea Corallo: wrote comp-common.el comp-cstr-tests.el comp-cstr.el
   comp-run.el comp-tests.el comp.c comp.el syncdoc-type-hierarchy.el
 and changed pdumper.c lread.c bytecomp.el configure.ac startup.el
-  loadup.el comp.h lisp.h cl-macs.el cl-preloaded.el comp-test-funcs.el
+  loadup.el comp.h lisp.h cl-macs.el comp-test-funcs.el cl-preloaded.el
   subr.el Makefile.in data.c elisp-mode.el nadvice.el alloc.c byte-run.el
   emacs.c lisp/Makefile.in advice.el and 101 other files
 
@@ -1740,7 +1740,7 @@ and co-wrote help-tests.el
 and changed xdisp.c display.texi w32.c msdos.c simple.el w32fns.c
   files.el fileio.c keyboard.c configure.ac emacs.c text.texi w32term.c
   dispnew.c frames.texi files.texi w32proc.c xfaces.c window.c
-  dispextern.h lisp.h and 1407 other files
+  dispextern.h lisp.h and 1409 other files
 
 Eliza Velasquez: changed server.el simple.el
 
@@ -2625,7 +2625,7 @@ James TD Smith: changed org.el org-colview.el org-clock.el
   org.texi
 
 James Thomas: changed eww.el nnmail.el quail/indian.el gnus-cache.el
-  gnus-msg.el ind-util.el info-look.el progmodes/python.el
+  gnus-msg.el gnus.texi ind-util.el info-look.el progmodes/python.el
 
 James Troup: changed gnus-sum.el
 
@@ -3198,8 +3198,8 @@ Joshua Datko: changed fortune.el
 
 Joshua Varner: changed intro.texi
 
-Jostein Kjønigsen: changed csharp-mode.el typescript-ts-mode.el js.el
-  eglot.el progmodes/compile.el README dotnet-appconfig.rnc
+Jostein Kjønigsen: changed csharp-mode.el typescript-ts-mode.el eglot.el
+  js.el progmodes/compile.el README dotnet-appconfig.rnc
   dotnet-packages-config.rnc dotnet-packages-props.rnc dotnet-resx.rnc
   json-ts-mode.el msbuild.rnc nuget.rnc nuspec.rnc nxml-mode.el
   schemas.xml treesit.el
@@ -3443,6 +3443,8 @@ and changed pgg-gpg.el pgg.el progmodes/python.el locked-encrypted.png
   locked-encrypted.xpm pgg-pgp.el pgg-pgp5.el unlocked-encrypted.png
   unlocked-encrypted.xpm README edebug.el pgg.texi tips.texi
 
+Ken Mankoff: changed leuven-dark-theme.el leuven-theme.el
+
 Kenneth Stailey: changed alpha.h configure.ac ns32000.h openbsd.h pmax.h
   sparc.h unexalpha.c unexelf.c
 
@@ -3564,11 +3566,11 @@ Koichi Arakawa: changed tramp-sh.el w32proc.c
 Konrad Hinsen: wrote ol-eshell.el
 and changed ob-python.el
 
-Konstantin Kharlamov: changed smerge-mode.el diff-mode.el files.el
-  indent.erts typescript-ts-mode.el ada-mode.el alloc.c autorevert.el
-  calc-aent.el calc-ext.el calc-lang.el cc-mode.el cperl-mode.el
-  css-mode.el cua-rect.el dnd.el ebnf-abn.el ebnf-dtd.el ebnf-ebx.el
-  emacs-module-tests.el epg.el and 33 other files
+Konstantin Kharlamov: changed indent.erts smerge-mode.el
+  typescript-ts-mode.el diff-mode.el files.el ada-mode.el alloc.c
+  autorevert.el calc-aent.el calc-ext.el calc-lang.el cc-mode.el
+  cperl-mode.el css-mode.el cua-rect.el dnd.el ebnf-abn.el ebnf-dtd.el
+  ebnf-ebx.el emacs-module-tests.el epg.el and 33 other files
 
 Konstantin Kliakhandler: changed org-agenda.el
 
@@ -3727,6 +3729,8 @@ Lewis Perin: changed emacs-x86.manifest
 
 Liam Healy: changed outline.el
 
+Liam Hupfer: changed js.el
+
 Liam Stitt: changed url-file.el url-vars.el
 
 Liang Wang: changed etags.el
@@ -5058,9 +5062,9 @@ Piotr Zieliński: wrote org-mouse.el
 
 Pip Cet: wrote image-circular-tests.el
 and changed xdisp.c comp.c byte-opt.el fns.c pdumper.c alloc.c
-  display.texi ftcrfont.c image.c sfnt.c xterm.c DEBUG bytecomp-tests.el
-  bytecomp.el ccl-tests.el ccl.c ccl.el cl-macs.el cmds.c comint.el
-  comp-test-funcs.el and 34 other files
+  display.texi eval.c ftcrfont.c image.c sfnt.c xterm.c DEBUG
+  bytecomp-tests.el bytecomp.el ccl-tests.el ccl.c ccl.el cl-macs.el
+  cmds.c comint.el and 34 other files
 
 Platon Pronko: changed tramp.el
 
@@ -5538,10 +5542,10 @@ Sean O'Rourke: changed complete.el comint.el dabbrev.el find-func.el
 Sean Sieger: changed emacs-lisp-intro.texi
 
 Sean Whitton: wrote em-elecslash.el em-extpipe-tests.el em-extpipe.el
-and changed vc-git.el project.el bindings.el server.el simple.el subr.el
-  vc-dispatcher.el vc.el window.el eshell-tests.el eshell.texi subr-x.el
-  .dir-locals.el cl-macs.el eshell-tests-helpers.el files.texi ftfont.c
-  remember.el startup.el term.el INSTALL and 38 other files
+and changed vc-git.el project.el vc.el bindings.el server.el simple.el
+  subr.el vc-dispatcher.el window.el eshell-tests.el eshell.texi
+  subr-x.el .dir-locals.el cl-macs.el eshell-tests-helpers.el files.texi
+  ftfont.c remember.el startup.el term.el INSTALL and 40 other files
 
 Sebastian Fieber: changed gnus-art.el mm-decode.el mm-view.el
 
@@ -6430,6 +6434,8 @@ and changed ps-prin1.ps ps-bdf.el ps-prin0.ps blank-mode.el ps-prin3.ps
   easymenu.el loading.texi menu-bar.el misc.texi progmodes/compile.el
   ps-print-def.el ps-vars.el
 
+Vinícius Moraes: changed cmuscheme.el
+
 Vitalie Spinu: changed comint.el eieio-base.el message.el ob-R.el
   ob-core.el ob-tangle.el subr.el
 
@@ -6593,7 +6599,7 @@ Xi Lu: changed etags.c htmlfontify.el ruby-mode.el CTAGS.good_crlf
   man-tests.el man.el shortdoc.el tramp-sh.el
 
 Xiyue Deng: changed emacs-lisp-intro.texi strings.texi functions.texi
-  symbols.texi
+  smtpmail.el symbols.texi
 
 Xuan Wang: changed warnings.el
 
diff --git a/etc/HISTORY b/etc/HISTORY
index bb8155de112..5758d5853d5 100644
--- a/etc/HISTORY
+++ b/etc/HISTORY
@@ -241,6 +241,8 @@ GNU Emacs 29.4 (2024-06-22) emacs-29.4
 
 GNU Emacs 30.1 (2025-02-23) emacs-30.1
 
+GNU Emacs 30.2 (2025-08-14) emacs-30.2
+
 
 ----------------------------------------------------------------------
 This file is part of GNU Emacs.
diff --git a/etc/NEWS.30 b/etc/NEWS.30
index c52929b6d38..dfe6c5cafe6 100644
--- a/etc/NEWS.30
+++ b/etc/NEWS.30
@@ -16,31 +16,8 @@ You can narrow news to a specific version by calling 'view-emacs-news'
 with a prefix argument or by typing 'C-u C-h C-n'.
 
 
-* Installation Changes in Emacs 30.2
-
-
-* Startup Changes in Emacs 30.2
-
-
 * Changes in Emacs 30.2
-
-
-* Editing Changes in Emacs 30.2
-
-
-* Changes in Specialized Modes and Packages in Emacs 30.2
-
-
-* New Modes and Packages in Emacs 30.2
-
-
-* Incompatible Lisp Changes in Emacs 30.2
-
-
-* Lisp Changes in Emacs 30.2
-
-
-* Changes in Emacs 30.2 on Non-Free Operating Systems
+Emacs 30.2 is a bug-fix release with no new features.
 
 
 * Installation Changes in Emacs 30.1
diff --git a/lisp/emacs-lisp/cl-generic.el b/lisp/emacs-lisp/cl-generic.el
index d02d0d6c2a4..e821b15378b 100644
--- a/lisp/emacs-lisp/cl-generic.el
+++ b/lisp/emacs-lisp/cl-generic.el
@@ -230,9 +230,11 @@ SPECIALIZERS-FUNCTION takes as first argument a tag value TAG
 (defmacro cl-defgeneric (name args &rest options-and-methods)
   "Create a generic function NAME.
 DOC-STRING is the base documentation for this class.  A generic
-function has no body, as its purpose is to decide which method body
-is appropriate to use.  Specific methods are defined with `cl-defmethod'.
-With this implementation the ARGS are currently ignored.
+function usually has no body, as its purpose is to decide which
+method body is appropriate to use; ARGS are currently ignored if
+there's no body.  If BODY is present, it provides the default
+implementation.
+Specific implementation methods are defined with `cl-defmethod'.
 OPTIONS-AND-METHODS currently understands:
 - (:documentation DOCSTRING)
 - (declare DECLARATIONS)
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 51633f686eb..3c1f36fa8de 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -1633,7 +1633,10 @@ of."
                "-t %s"
                (format-time-string "%Y%m%d%H%M.%S" (tramp-defined-time time) t))
             "")
-          (if (eq flag 'nofollow) "-h" "")
+          (if (and (eq flag 'nofollow)
+                   (tramp-get-connection-property v "touch-h"))
+              "-h"
+            "")
           (tramp-shell-quote-argument localname))))))
 
 (defun tramp-sh-handle-get-home-directory (vec &optional user)
@@ -5889,12 +5892,12 @@ Nonexistent directories are removed from spec."
   "Determine remote `touch' command."
   (with-tramp-connection-property vec "touch"
     (tramp-message vec 5 "Finding a suitable `touch' command")
-    (let ((result (tramp-find-executable
-                   vec "touch" (tramp-get-remote-path vec)))
-          (tmpfile (tramp-make-tramp-temp-name vec)))
-      ;; Busyboxes do support the "-t" option only when they have been
-      ;; built with the DESKTOP config option.  Let's check it.
-      (when result
+    (when-let* ((result (tramp-find-executable
+                         vec "touch" (tramp-get-remote-path vec)))
+                (tmpfile (tramp-make-tramp-temp-name vec)))
+      (prog1 result
+        ;; Busyboxes do support the "-t" option only when they have
+        ;; been built with the DESKTOP config option.  Let's check it.
         (tramp-set-connection-property
          vec "touch-t"
          (tramp-send-command-and-check
@@ -5904,8 +5907,13 @@ Nonexistent directories are removed from spec."
            result
            (format-time-string "%Y%m%d%H%M.%S")
            (tramp-file-local-name tmpfile))))
-        (delete-file tmpfile))
-      result)))
+        ;; The touch command included in busybox (version 1.30.1-6) on
+        ;; OpenWrt does not have the option "-h".
+        (tramp-set-connection-property
+         vec "touch-h"
+         (tramp-send-command-and-check
+          vec (format "%s -h %s" result (tramp-file-local-name tmpfile))))
+        (delete-file tmpfile)))))
 
 (defun tramp-get-remote-df (vec)
   "Determine remote `df' command."
diff --git a/lisp/progmodes/executable.el b/lisp/progmodes/executable.el
index b003b75b0e4..aa3a74d30fa 100644
--- a/lisp/progmodes/executable.el
+++ b/lisp/progmodes/executable.el
@@ -180,7 +180,7 @@ command to find the next error.  The buffer is also in `comint-mode' and
 `compilation-shell-minor-mode', so that you can answer any prompts."
   (interactive (list (read-string "Run script: "
                                   (or executable-command
-                                      buffer-file-name))))
+                                      (file-local-name buffer-file-name)))))
   (require 'compile)
   (save-some-buffers (not compilation-ask-about-save))
   (setq-local executable-command command)
diff --git a/make-dist b/make-dist
index fb3829d11f8..93eeb056d39 100755
--- a/make-dist
+++ b/make-dist
@@ -369,7 +369,7 @@ possibly_non_vc_files="
 ) || exit
 
 if [ $with_info = yes ]; then
-  info_files="info/dir $(echo info/*.info)" || exit
+  info_files="info/dir $(echo info/*.info info/*.txt info/*.jpg)" || exit
 else
   info_files=
 fi