summaryrefslogtreecommitdiff
path: root/lisp/net
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2022-05-17 09:13:34 +0200
committerMichael Albinus <michael.albinus@gmx.de>2022-05-17 09:13:34 +0200
commitf836ed098fe8c649e3c30cf55696b3a750f1bbf0 (patch)
tree49f53ed98f99bcec09f56ccbbe95af5ab13f3076 /lisp/net
parentf928330fa86e1493d2862180b132a99022458c96 (diff)
downloademacs-f836ed098fe8c649e3c30cf55696b3a750f1bbf0.tar.gz
emacs-f836ed098fe8c649e3c30cf55696b3a750f1bbf0.tar.bz2
emacs-f836ed098fe8c649e3c30cf55696b3a750f1bbf0.zip
Some minor Tramp fixes
* lisp/net/tramp-cmds.el (tramp-list-tramp-buffers) (tramp-list-remote-buffers): Add ;;;###tramp-autoload cookie. * lisp/net/tramp-fuse.el (tramp-fuse-remove-hidden-files): New defvar. (tramp-fuse-remove-hidden-files): Use it. * lisp/net/tramp-gvfs.el (tramp-gvfs-handler-askquestion): Keep regression tests running.
Diffstat (limited to 'lisp/net')
-rw-r--r--lisp/net/tramp-cmds.el2
-rw-r--r--lisp/net/tramp-fuse.el11
-rw-r--r--lisp/net/tramp-gvfs.el36
3 files changed, 30 insertions, 19 deletions
diff --git a/lisp/net/tramp-cmds.el b/lisp/net/tramp-cmds.el
index 43aed625550..8e359c382bf 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 54e7999e7a3..7344c3c730a 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 c09c016e647..3a5041c4918 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -1774,22 +1774,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.