summaryrefslogtreecommitdiff
path: root/lisp/net/tramp-sh.el
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2017-04-06 21:00:29 +0200
committerMichael Albinus <michael.albinus@gmx.de>2017-04-06 21:00:29 +0200
commit69061fd1341629d059a8846aa89eedeed42552d1 (patch)
tree69daec2dad9e05c8f2a9be74b153a8bf3f8206c6 /lisp/net/tramp-sh.el
parentc1fa07222e9c76964d1261c31b50f1e399554fa2 (diff)
downloademacs-69061fd1341629d059a8846aa89eedeed42552d1.tar.gz
emacs-69061fd1341629d059a8846aa89eedeed42552d1.tar.bz2
emacs-69061fd1341629d059a8846aa89eedeed42552d1.zip
Add new Tramp syntax
* lisp/net/tramp-cmds.el (tramp-change-syntax): New defun. * lisp/net/tramp.el (tramp-syntax): Change default to `def'. Add :set function. (tramp-prefix-port-format): Simplify. (tramp-file-name-regexp-separate): Remove. (tramp-initial-file-name-regexp) (tramp-completion-file-name-regexp-old-style) (tramp-initial-completion-file-name-regexp): New defconst. (tramp-prefix-format, tramp-prefix-regexp) (tramp-method-regexp, tramp-postfix-method-format) (tramp-postfix-method-regexp, tramp-prefix-ipv6-format) (tramp-prefix-ipv6-regexp, tramp-postfix-ipv6-format) (tramp-postfix-ipv6-regexp) (tramp-postfix-host-format, tramp-postfix-host-regexp) (tramp-remote-file-name-spec-regexp) (tramp-file-name-structure, tramp-file-name-regexp) (tramp-completion-file-name-regexp) (tramp-rfn-eshadow-update-overlay-regexp): Change them to be defuns. (tramp-tramp-file-p, tramp-find-method) (tramp-dissect-file-name, tramp-make-tramp-file-name) (tramp-completion-make-tramp-file-name) (tramp-rfn-eshadow-update-overlay) (tramp-register-autoload-file-name-handlers) (tramp-register-file-name-handlers) (tramp-unload-file-name-handlers) (tramp-completion-handle-file-name-all-completions) (tramp-completion-dissect-file-name, tramp-clear-passwd): * lisp/net/tramp-ftp.el (tramp-ftp-file-name-handler): * lisp/net/tramp-sh.el (tramp-sh-handle-vc-registered) (tramp-compute-multi-hops): Use them.
Diffstat (limited to 'lisp/net/tramp-sh.el')
-rw-r--r--lisp/net/tramp-sh.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index e4a48b7f8e2..997716227bc 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -3445,7 +3445,7 @@ the result will be a local, non-Tramp, file name."
(let (tramp-vc-registered-file-names
(remote-file-name-inhibit-cache (current-time))
(file-name-handler-alist
- `((,tramp-file-name-regexp . tramp-vc-file-name-handler))))
+ `((,(tramp-file-name-regexp) . tramp-vc-file-name-handler))))
;; Here we collect only file names, which need an operation.
(ignore-errors (tramp-run-real-handler 'vc-registered (list file)))
@@ -4482,7 +4482,7 @@ Goes through the list `tramp-inline-compress-commands'."
(let ((user (tramp-file-name-user item))
(host (tramp-file-name-host item))
(proxy (concat
- tramp-prefix-format proxy tramp-postfix-host-format)))
+ (tramp-prefix-format) proxy (tramp-postfix-host-format))))
(tramp-message
vec 5 "Add proxy (\"%s\" \"%s\" \"%s\")"
(and (stringp host) (regexp-quote host))