; Minor Tramp changes

* doc/misc/tramp.texi (Top): Add Key Index to menu.
(Key Index): New node.

* lisp/net/tramp-cmds.el (tramp-dired-buffer-command-completion-p):
New defun.
(tramp-dired-find-file-with-sudo): Add property
`completion-predicate'.

(cherry picked from commit 4b8b7bb5cfc27b88fdf892a87931f5b89ff8c4a3)

diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 04811355b9a492b5c01a9b8f6e0de9cb06731cf5..45948ad95dc27136b513bb2f3d771de6eb4fdcef 100644 (file)
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -101,6 +101,7 @@ For the developer:
 * GNU Free Documentation License:: The license for this documentation.
 * Function Index::              @value{tramp} functions.
 * Variable Index::              User options and variables.
+* Key Index::                   Key bindings for @value{tramp} commands.
 * Concept Index::               An item for each concept.
 
 @detailmenu
@@ -6784,6 +6785,11 @@ maintainers, analyzing the remote commands for performance analysis.
 @printindex vr
 
 
+@node Key Index
+@unnumbered Key Index
+@printindex ky
+
+
 @node Concept Index
 @unnumbered Concept Index
 @printindex cp

diff --git a/lisp/net/tramp-cmds.el b/lisp/net/tramp-cmds.el
index 6db1e9bfd12875df5054ea7cd082bdcc7ff2a921..9161d233b280b02306ee1f5a24ccee237e980ec3 100644 (file)
--- a/lisp/net/tramp-cmds.el
+++ b/lisp/net/tramp-cmds.el
@@ -717,20 +717,30 @@ If the buffer runs `dired', the buffer is reverted."
       (dired-advertise)
       (revert-buffer)))))
 
-;; FIXME: See FIXME above about renaming this before Emacs 31.1.
+;; This function takes action, when `read-extended-command-predicate'
+;; is set to `command-completion-default-include-p'.
+(defun tramp-dired-buffer-command-completion-p (_symbol buffer)
+  "A predicate for Tramp interactive commands.
+They are completed by `M-x TAB' only in Dired buffers."
+  (declare (tramp-suppress-trace t))
+  (with-current-buffer buffer
+    (tramp-dired-buffer-p)))
 
 ;;;###autoload
 (defun tramp-dired-find-file-with-sudo ()
-  "Visit the file or directory named on this line as the superuser.
-
-By default this is done using the \"sudo\" Tramp method.
-YOu can customize `tramp-file-name-with-method' to change this.
-
-Interactively, with a prefix argument, prompt for a different method."
+  "In Dired, visit the file or directory named on this line.
+This is performed with \"sudo\" permissions."
+  ;; (declare (completion tramp-dired-buffer-command-completion-p))
   (interactive)
   (with-tramp-file-name-with-method
     (find-file (tramp-file-name-with-sudo (dired-get-file-for-visit)))))
 
+;; `tramp-dired-buffer-command-completion-p' is not autoloaded, and this
+;; setting isn't either.
+(function-put
+ #'tramp-dired-find-file-with-sudo 'completion-predicate
+ #'tramp-dired-buffer-command-completion-p)
+
 ;;; Recompile on ELPA
 
 ;; This function takes action, when `read-extended-command-predicate'