emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 56e81ca25b 1/4: Merge from origin/emacs-28


From: Michael Albinus
Subject: master 56e81ca25b 1/4: Merge from origin/emacs-28
Date: Sat, 21 May 2022 09:44:34 -0400 (EDT)

branch: master
commit 56e81ca25b0b88df7d8659c60dc8abdd559a03c9
Merge: 22ae842b34 f836ed098f
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>

    Merge from origin/emacs-28
    
    f836ed098f Some minor Tramp fixes
---
 lisp/net/tramp-cmds.el |  2 ++
 lisp/net/tramp-fuse.el | 11 ++++++++---
 lisp/net/tramp-gvfs.el | 36 ++++++++++++++++++++----------------
 3 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/lisp/net/tramp-cmds.el b/lisp/net/tramp-cmds.el
index c18ab4972d..006683bdcc 100644
--- a/lisp/net/tramp-cmds.el
+++ b/lisp/net/tramp-cmds.el
@@ -51,6 +51,7 @@ SYNTAX can be one of the symbols `default' (default),
   (when syntax
     (customize-set-variable 'tramp-syntax syntax)))
 
+;;;###tramp-autoload
 (defun tramp-list-tramp-buffers ()
   "Return a list of all Tramp connection buffers."
   (append
@@ -61,6 +62,7 @@ SYNTAX can be one of the symbols `default' (default),
    (all-completions
     "*trace tramp" (mapcar #'list (mapcar #'buffer-name (buffer-list))))))
 
+;;;###tramp-autoload
 (defun tramp-list-remote-buffers ()
   "Return a list of all buffers with remote `default-directory'."
   (delq
diff --git a/lisp/net/tramp-fuse.el b/lisp/net/tramp-fuse.el
index 596c08f04c..20be74a79b 100644
--- a/lisp/net/tramp-fuse.el
+++ b/lisp/net/tramp-fuse.el
@@ -44,11 +44,16 @@
     (delete-file (tramp-fuse-local-file-name filename) trash)
     (tramp-flush-file-properties v localname)))
 
+(defvar tramp-fuse-remove-hidden-files nil
+  "Remove hidden files from directory listings.")
+
 (defsubst tramp-fuse-remove-hidden-files (files)
   "Remove hidden files from FILES."
-  (cl-remove-if
-   (lambda (x) (and (stringp x) (string-match-p "\\.fuse_hidden" x)))
-   files))
+  (if tramp-fuse-remove-hidden-files
+      (cl-remove-if
+       (lambda (x) (and (stringp x) (string-match-p "\\.fuse_hidden" x)))
+       files)
+    files))
 
 (defun tramp-fuse-handle-directory-files
     (directory &optional full match nosort count)
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index 752dfdb068..fca3988b8d 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -1788,22 +1788,26 @@ a downcased host name only."
                  (list
                   t ;; handled.
                   nil ;; no abort of D-Bus.
-                  (with-tramp-connection-property (tramp-get-process v) message
-                    ;; In theory, there can be several choices.
-                    ;; Until now, there is only the question whether
-                    ;; to accept an unknown host signature or certificate.
-                    (with-temp-buffer
-                      ;; Preserve message for `progress-reporter'.
-                      (with-temp-message ""
-                        (insert message)
-                        (goto-char (point-max))
-                        (if noninteractive
-                            (message "%s" message)
-                          (pop-to-buffer (current-buffer)))
-                        (if (yes-or-no-p
-                             (buffer-substring
-                              (line-beginning-position) (point)))
-                            0 1)))))
+                  ;; Preserve message for `progress-reporter'.
+                  (with-temp-message ""
+                    (if noninteractive
+                        ;; Keep regression tests running.
+                        (progn
+                          (message "%s" message)
+                          0)
+                      (with-tramp-connection-property (tramp-get-process v) 
message
+                        ;; In theory, there can be several choices.
+                        ;; Until now, there is only the question
+                        ;; whether to accept an unknown host
+                        ;; signature or certificate.
+                        (with-temp-buffer
+                          (insert message)
+                          (goto-char (point-max))
+                          (pop-to-buffer (current-buffer))
+                          (if (yes-or-no-p
+                               (buffer-substring
+                                (line-beginning-position) (point)))
+                              0 1))))))
 
                ;; When QUIT is raised, we shall return this
                ;; information to D-Bus.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]