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

3 files changed, 23 insertions, 13 deletions

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)