From 37457855f719b1401854d933e003b48560cfc9ca Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Tue, 25 Feb 2025 12:40:33 +0100 Subject: [PATCH] ; Fix last change * lisp/net/tramp-cmds.el (tramp-list-remote-buffers) (tramp-list-remote-buffer-connections): Fix docstring. (tramp-cleanup-bufferless-connections): Use `string-join'. (cherry picked from commit c8985a6d9fe955c66bb24c910708957ed88afb55) --- doc/misc/tramp.texi | 1 - lisp/net/tramp-cmds.el | 17 +++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index bfbe96ca665..68bb7164e91 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -4792,7 +4792,6 @@ buffers, and buffers related to a remote process are cleaned up. @end defopt @deffn Command tramp-cleanup-bufferless-connections - Similar to @code{tramp-cleanup-all-connections}, remote connections and ad-hoc proxy definitions are flushed, but limited to those connections for which no associated buffers exist (except for Tramp internal diff --git a/lisp/net/tramp-cmds.el b/lisp/net/tramp-cmds.el index c5e2bf1b3c3..65f03f49885 100644 --- a/lisp/net/tramp-cmds.el +++ b/lisp/net/tramp-cmds.el @@ -99,9 +99,9 @@ SYNTAX can be one of the symbols `default' (default), ;; Use `match-buffers' starting with Emacs 29.1. ;;;###tramp-autoload (defun tramp-list-remote-buffers () - "Return a list of remote buffers, excluding internal tramp buffers. -A buffer is considered remote if either its `default-directory' or its -buffer file name is a remote file name." + "Return a list of remote buffers, excluding internal Tramp buffers. +A buffer is considered remote if either its `default-directory' or +`buffer-file-name' is a remote file name." (tramp-compat-seq-keep (lambda (buffer) (when (tramp-tramp-file-p @@ -113,8 +113,8 @@ buffer file name is a remote file name." ;;;###tramp-autoload (defun tramp-list-remote-buffer-connections () "Return a list of all remote buffer connections. -A buffer is considered remote if either its `default-directory' or the -function `buffer-file-name' is a remote file name." +A buffer is considered remote if either its `default-directory' or +`buffer-file-name' is a remote file name." (seq-uniq (mapcar (lambda (buffer) (or @@ -122,7 +122,7 @@ function `buffer-file-name' is a remote file name." (file-remote-p (buffer-file-name buffer))) (when (tramp-get-default-directory buffer) (file-remote-p (tramp-get-default-directory buffer))))) - ;; Eliminate false positives from internal tramp buffers + ;; Eliminate false positives from internal Tramp buffers. (seq-remove (lambda (buffer) (member (buffer-name buffer) (tramp-list-tramp-buffers))) @@ -354,9 +354,10 @@ Display a message of cleaned-up connections." (seq-difference (mapcar #'tramp-make-tramp-file-name (tramp-list-connections)) (tramp-list-remote-buffer-connections)))) - (message "Cleaning up %s" (mapconcat #'identity bufferless-connections ", ")) + (message "Cleaning up %s" (string-join bufferless-connections ", ")) (dolist (connection bufferless-connections) - (tramp-cleanup-connection (tramp-dissect-file-name connection 'noexpand))))) + (tramp-cleanup-connection + (tramp-dissect-file-name connection 'noexpand))))) ;;; Rename -- 2.39.5