aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2017-11-05 12:40:58 +0100
committerMichael Albinus2017-11-05 12:40:58 +0100
commit8db2b3a79bef0dab286badc3f0af164387a24a67 (patch)
treea5e7dd9c142b7e707529c90590f60b62741765aa
parent8c50842790a680aa0732fddeb4454eaa0ac2d7a6 (diff)
downloademacs-8db2b3a79bef0dab286badc3f0af164387a24a67.tar.gz
emacs-8db2b3a79bef0dab286badc3f0af164387a24a67.zip
Allow "%" in Tramp host names
* lisp/net/tramp-gvfs.el (tramp-gvfs-url-file-name): Hexify also host. * lisp/net/tramp.el (tramp-host-regexp): Allow "%" in host names.
-rw-r--r--lisp/net/tramp-gvfs.el3
-rw-r--r--lisp/net/tramp.el5
2 files changed, 3 insertions, 5 deletions
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index 51d24cbc1b0..709ea4670a8 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -1292,7 +1292,8 @@ file-notify events."
1292 (when (and user domain) 1292 (when (and user domain)
1293 (setq user (concat domain ";" user))) 1293 (setq user (concat domain ";" user)))
1294 (url-parse-make-urlobj 1294 (url-parse-make-urlobj
1295 method (and user (url-hexify-string user)) nil host 1295 method (and user (url-hexify-string user))
1296 nil (and host (url-hexify-string host))
1296 (if (stringp port) (string-to-number port) port) 1297 (if (stringp port) (string-to-number port) port)
1297 (and localname (url-hexify-string localname)) nil nil t)) 1298 (and localname (url-hexify-string localname)) nil nil t))
1298 (url-parse-make-urlobj 1299 (url-parse-make-urlobj
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index e300b3a58ed..67192e32401 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -818,7 +818,7 @@ Used in `tramp-make-tramp-file-name'.")
818 "Regexp matching delimiter between user and host names. 818 "Regexp matching delimiter between user and host names.
819Derived from `tramp-postfix-user-format'.") 819Derived from `tramp-postfix-user-format'.")
820 820
821(defconst tramp-host-regexp "[a-zA-Z0-9_.-]+" 821(defconst tramp-host-regexp "[a-zA-Z0-9_.%-]+"
822 "Regexp matching host names.") 822 "Regexp matching host names.")
823 823
824(defconst tramp-prefix-ipv6-format-alist 824(defconst tramp-prefix-ipv6-format-alist
@@ -4631,9 +4631,6 @@ Only works for Bourne-like shells."
4631(provide 'tramp) 4631(provide 'tramp)
4632 4632
4633;;; TODO: 4633;;; TODO:
4634
4635;; * In Emacs 21, `insert-directory' shows total number of bytes used
4636;; by the files in that directory. Add this here.
4637;; 4634;;
4638;; * Avoid screen blanking when hitting `g' in dired. (Eli Tziperman) 4635;; * Avoid screen blanking when hitting `g' in dired. (Eli Tziperman)
4639;; 4636;;