aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2019-02-04 16:02:46 +0100
committerMichael Albinus2019-02-04 16:02:46 +0100
commit7cdf4004c8b04cf5a7135effddc8d4f05981adf9 (patch)
treed410045156db31ae6d62cde9187bbcec3c0bb0e6
parent49f6243027d910032f014be15b2c4ac2175c25f8 (diff)
downloademacs-7cdf4004c8b04cf5a7135effddc8d4f05981adf9.tar.gz
emacs-7cdf4004c8b04cf5a7135effddc8d4f05981adf9.zip
Improve Tramp host name completion
* lisp/net/tramp-rclone.el (tramp-default-host-alist): Add empty host. * lisp/net/tramp.el (tramp-parse-auth-sources): Require :port.
-rw-r--r--lisp/net/tramp-rclone.el17
-rw-r--r--lisp/net/tramp.el3
2 files changed, 10 insertions, 10 deletions
diff --git a/lisp/net/tramp-rclone.el b/lisp/net/tramp-rclone.el
index 9f46adb4da6..48adea06898 100644
--- a/lisp/net/tramp-rclone.el
+++ b/lisp/net/tramp-rclone.el
@@ -50,16 +50,15 @@
50 50
51;;;###tramp-autoload 51;;;###tramp-autoload
52(tramp--with-startup 52(tramp--with-startup
53 (add-to-list 53 (add-to-list 'tramp-methods
54 'tramp-methods 54 `(,tramp-rclone-method
55 `(,tramp-rclone-method 55 (tramp-mount-args nil)
56 (tramp-mount-args nil) 56 (tramp-copyto-args nil)
57 (tramp-copyto-args nil) 57 (tramp-moveto-args nil)
58 (tramp-moveto-args nil) 58 (tramp-about-args ("--full"))))
59 (tramp-about-args ("--full"))))) 59
60 (add-to-list 'tramp-default-host-alist `(,tramp-rclone-method nil ""))
60 61
61;;;###tramp-autoload
62(tramp--with-startup
63 (tramp-set-completion-function 62 (tramp-set-completion-function
64 tramp-rclone-method '((tramp-rclone-parse-device-names "")))) 63 tramp-rclone-method '((tramp-rclone-parse-device-names ""))))
65 64
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index b1c06690481..d000bbe3d65 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -2867,7 +2867,8 @@ for all methods. Resulting data are derived from default settings."
2867 (and tramp-completion-use-auth-sources 2867 (and tramp-completion-use-auth-sources
2868 (mapcar 2868 (mapcar
2869 (lambda (x) `(,(plist-get x :user) ,(plist-get x :host))) 2869 (lambda (x) `(,(plist-get x :user) ,(plist-get x :host)))
2870 (auth-source-search :port method :max most-positive-fixnum)))) 2870 (auth-source-search
2871 :port method :require '(:port) :max most-positive-fixnum))))
2871 2872
2872;; Generic function. 2873;; Generic function.
2873(defun tramp-parse-group (regexp match-level skip-regexp) 2874(defun tramp-parse-group (regexp match-level skip-regexp)