[elpa] externals/tramp 8f2578d043: Tramp ELPA version 2.5.2.4 released

[ELPA Syncer]

branch: externals/tramp
commit 8f2578d043d2d633c20a74a8b836920b7d0a3fa0
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>

    Tramp ELPA version 2.5.2.4 released
---
 README             |  4 ++--
 texi/trampver.texi |  2 +-
 tramp-archive.el   | 15 +++++++--------
 tramp-sh.el        | 11 +++++++----
 tramp.el           | 17 +++++++++--------
 trampver.el        |  6 +++---
 6 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/README b/README
index 53816c8b85..54c4e722e6 100644
--- a/README
+++ b/README
@@ -22,11 +22,11 @@ installed with, you must recompile the package:
 
    * Remove all byte-compiled Tramp files
 
-          $ rm -f ~/.emacs.d/elpa/tramp-2.5.2.3/tramp*.elc
+          $ rm -f ~/.emacs.d/elpa/tramp-2.5.2.4/tramp*.elc
 
    * Start Emacs with Tramp's source files
 
-          $ emacs -L ~/.emacs.d/elpa/tramp-2.5.2.3 -l tramp
+          $ emacs -L ~/.emacs.d/elpa/tramp-2.5.2.4 -l tramp
 
      This should not give you the error.
 
diff --git a/texi/trampver.texi b/texi/trampver.texi
index 2c673cee8d..11fac9a961 100644
--- a/texi/trampver.texi
+++ b/texi/trampver.texi
@@ -8,7 +8,7 @@
 @c In the Tramp GIT, the version numbers are auto-frobbed from
 @c tramp.el, and the bug report address is auto-frobbed from
 @c configure.ac.
-@set trampver 2.5.2.3
+@set trampver 2.5.2.4
 @set trampurl https://www.gnu.org/software/tramp/
 @set tramp-bug-report-address tramp-devel@@gnu.org
 @set emacsver 25.1
diff --git a/tramp-archive.el b/tramp-archive.el
index 22390ef45b..4b649edaab 100644
--- a/tramp-archive.el
+++ b/tramp-archive.el
@@ -356,14 +356,13 @@ arguments to pass to the OPERATION."
 (progn (defun tramp-archive-autoload-file-name-handler (operation &rest args)
   "Load Tramp archive file name handler, and perform OPERATION."
   (defvar tramp-archive-autoload)
-  (when tramp-archive-enabled
-    ;; We cannot use `tramp-compat-temporary-file-directory' here due
-    ;; to autoload.  When installing Tramp's GNU ELPA package, there
-    ;; might be an older, incompatible version active.  We try to
-    ;; overload this.
-    (let ((default-directory temporary-file-directory)
-          (tramp-archive-autoload t))
-      (apply #'tramp-autoload-file-name-handler operation args)))))
+  (let (;; We cannot use `tramp-compat-temporary-file-directory' here
+       ;; due to autoload.  When installing Tramp's GNU ELPA package,
+       ;; there might be an older, incompatible version active.  We
+       ;; try to overload this.
+        (default-directory temporary-file-directory)
+        (tramp-archive-autoload tramp-archive-enabled))
+    (apply #'tramp-autoload-file-name-handler operation args))))
 
 (put #'tramp-archive-autoload-file-name-handler 'tramp-autoload t)
 
diff --git a/tramp-sh.el b/tramp-sh.el
index 54fb539a56..67f5519bbf 100644
--- a/tramp-sh.el
+++ b/tramp-sh.el
@@ -1189,12 +1189,18 @@ component is used as the target of the symlink."
            ;; The scripts could fail, for example with huge file size.
            (tramp-do-file-attributes-with-ls v localname id-format))))))))
 
+(defconst tramp-sunos-unames (regexp-opt '("SunOS 5.10" "SunOS 5.11"))
+  "Regexp to determine remote SunOS.")
+
 (defun tramp-sh--quoting-style-options (vec)
   "Quoting style options to be used for VEC."
   (or
    (tramp-get-ls-command-with
     vec "--quoting-style=literal --show-control-chars")
-   (tramp-get-ls-command-with vec "-w")
+   ;; ls on Solaris does not return an error in that case.  We've got
+   ;; reports for "SunOS 5.11" so far.
+   (unless (tramp-check-remote-uname vec tramp-sunos-unames)
+     (tramp-get-ls-command-with vec "-w"))
    ""))
 
 (defun tramp-do-file-attributes-with-ls (vec localname &optional id-format)
@@ -3990,9 +3996,6 @@ Returns the exit code of the `test' program."
       switch
       (tramp-shell-quote-argument localname)))))
 
-(defconst tramp-sunos-unames (regexp-opt '("SunOS 5.10" "SunOS 5.11"))
-  "Regexp to determine remote SunOS.")
-
 (defun tramp-find-executable
   (vec progname dirlist &optional ignore-tilde ignore-path)
   "Search for PROGNAME in $PATH and all directories mentioned in DIRLIST.
diff --git a/tramp.el b/tramp.el
index a24d83f876..8baf72464d 100644
--- a/tramp.el
+++ b/tramp.el
@@ -5666,14 +5666,15 @@ verbosity of 6."
   "Return t if system process PROCESS-NAME is running for `user-login-name'."
   (when (stringp process-name)
     (catch 'result
-      (dolist (pid (list-system-processes))
-       (when-let ((attributes (process-attributes pid))
-                  (comm (cdr (assoc 'comm attributes))))
-         (and (string-equal (cdr (assoc 'user attributes)) (user-login-name))
-               ;; The returned command name could be truncated to 15
-               ;; characters.  Therefore, we cannot check for `string-equal'.
-              (string-prefix-p comm process-name)
-              (throw 'result t)))))))
+      (let ((default-directory temporary-file-directory))
+       (dolist (pid (list-system-processes))
+         (when-let ((attributes (process-attributes pid))
+                    (comm (cdr (assoc 'comm attributes))))
+           (and (string-equal (cdr (assoc 'user attributes)) (user-login-name))
+                ;; The returned command name could be truncated to 15
+                ;; characters.  Therefore, we cannot check for `string-equal'.
+                (string-prefix-p comm process-name)
+                (throw 'result t))))))))
 
 ;; When calling "emacs -Q", `auth-source-search' won't be called.  If
 ;; you want to debug exactly this case, call "emacs -Q --eval '(setq
diff --git a/trampver.el b/trampver.el
index 32193c659b..482c505c6e 100644
--- a/trampver.el
+++ b/trampver.el
@@ -7,7 +7,7 @@
 ;; Maintainer: Michael Albinus <michael.albinus@gmx.de>
 ;; Keywords: comm, processes
 ;; Package: tramp
-;; Version: 2.5.2.3
+;; Version: 2.5.2.4
 ;; Package-Requires: ((emacs "25.1"))
 ;; Package-Type: multi
 ;; URL: https://www.gnu.org/software/tramp/
@@ -40,7 +40,7 @@
 ;; ./configure" to change them.
 
 ;;;###tramp-autoload
-(defconst tramp-version "2.5.2.3"
+(defconst tramp-version "2.5.2.4"
   "This version of Tramp.")
 
 ;;;###tramp-autoload
@@ -76,7 +76,7 @@
 ;; Check for Emacs version.
 (let ((x   (if (not (string-lessp emacs-version "25.1"))
       "ok"
-    (format "Tramp 2.5.2.3 is not fit for %s"
+    (format "Tramp 2.5.2.4 is not fit for %s"
             (replace-regexp-in-string "\n" "" (emacs-version))))))
   (unless (string-equal "ok" x) (error "%s" x)))