Merge from origin/emacs-27

06364316e0 (origin/emacs-27) * lisp/net/tramp.el (tramp-file-local-na...
d3884f50e0 Adapt commentary in Tramp persistency file
2d82f5a44e Change Tramp version to 2.4.3.27.1
09b65707cc ; * src/dispnew.c (adjust_glyph_matrix): Fix last change.
37f9182b68 Fix redisplay when mode-line-format changes mode-line's he...
1420906b81 * src/fileio.c (Fwrite_region): Improve the doc string.
01dfcb7c87 Fix removal of frame decorations on Windows (Bug#38705)

4 files changed, 27 insertions, 4 deletions

diff --git a/lisp/frame.el b/lisp/frame.el
index c533e5a23fb..16ee7580f89 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -2725,6 +2725,9 @@ See also `toggle-frame-maximized'."
         line-prefix
         wrap-prefix
         truncate-lines
+        mode-line-format
+        header-line-format
+        tab-line-format
         display-line-numbers
         display-line-numbers-width
         display-line-numbers-current-absolute
diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el
index d4f6aa00263..b81a1a23d5f 100644
--- a/lisp/net/tramp-cache.el
+++ b/lisp/net/tramp-cache.el
@@ -474,7 +474,7 @@ used to cache connection properties of the local machine."
                   tramp-persistency-file-name))
              (error "\n"))
            ";; Tramp connection history.  Don't change this file.\n"
-           ";; You can delete it, forcing Tramp to reapply the checks.\n\n"
+           ";; Run `M-x tramp-cleanup-all-connections' instead.\n\n"
            (with-output-to-string
              (pp (read (format "(%s)" (tramp-cache-print cache)))))))))))
 
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 1e52fae49f0..85330e98aa2 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1329,6 +1329,25 @@ entry does not exist, return nil."
        (string-match-p tramp-file-name-regexp name)
        t))
 
+;; This function bypasses the file name handler approach.  It is NOT
+;; recommended to use it in any package if not absolutely necessary,
+;; because it won't work for remote file names not supported by Tramp.
+;; However, it is more performant than `file-local-name', and might be
+;; useful where performance matters, like in operations over a bulk
+;; list of file names.
+(defun tramp-file-local-name (name)
+  "Return the local name component of NAME.
+This function removes from NAME the specification of the remote
+host and the method of accessing the host, leaving only the part
+that identifies NAME locally on the remote system.  NAME must be
+a string that matches `tramp-file-name-regexp'.  The returned
+file name can be used directly as argument of ‘process-file’,
+‘start-file-process’, or ‘shell-command’."
+  (save-match-data
+    (and (tramp-tramp-file-p name)
+         (string-match (nth 0 tramp-file-name-structure) name)
+         (match-string (nth 4 tramp-file-name-structure) name))))
+
 (defun tramp-find-method (method user host)
   "Return the right method string to use depending on USER and HOST.
 This is METHOD, if non-nil.  Otherwise, do a lookup in
diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index e5f628d8537..dacdd44102f 100644
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -39,7 +39,7 @@
 (defvar inhibit-message)
 
 ;;;###tramp-autoload
-(defconst tramp-version "2.4.3"
+(defconst tramp-version "2.4.3.27.1"
   "This version of Tramp.")
 
 ;;;###tramp-autoload
@@ -73,7 +73,7 @@
 ;; Check for Emacs version.
 (let ((x   (if (not (string-lessp emacs-version "24.4"))
       "ok"
-    (format "Tramp 2.4.3 is not fit for %s"
+    (format "Tramp 2.4.3.27.1 is not fit for %s"
             (replace-regexp-in-string "\n" "" (emacs-version))))))
   (unless (string-equal "ok" x) (error "%s" x)))
 
@@ -92,7 +92,8 @@
          ("2.2.13.25.1" . "25.1") ("2.2.13.25.2" . "25.2")
          ("2.2.13.25.2" . "25.3")
          ("2.3.3" . "26.1") ("2.3.3.26.1" . "26.1") ("2.3.5.26.2" . "26.2")
-         ("2.3.5.26.3" . "26.3")))
+         ("2.3.5.26.3" . "26.3")
+         ("2.4.3.27.1" . "27.1")))
 
 (add-hook 'tramp-unload-hook
           (lambda ()