From 5fbf6856db55049a694585a5dc76d96ba09158b3 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Tue, 26 Nov 2013 16:07:10 +0100 Subject: [PATCH] * net/tramp.el (tramp-file-name-regexp-unified): Support IPv6 host names on MS Windows, like "/[::1]:". * net/tramp-sh.el (tramp-sh-handle-insert-directory): Accept nil SWITCHES. --- lisp/ChangeLog | 8 ++++++++ lisp/net/tramp-sh.el | 1 + lisp/net/tramp.el | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 25dcbc67ab7..c8a341483bc 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2013-11-26 Michael Albinus + + * net/tramp.el (tramp-file-name-regexp-unified): Support IPv6 host + names on MS Windows, like "/[::1]:". + + * net/tramp-sh.el (tramp-sh-handle-insert-directory): Accept nil + SWITCHES. + 2013-11-26 Glenn Morris * progmodes/python.el (python-indent-guess-indent-offset): diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 874e50fbfaa..455ea1d4e9e 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -2493,6 +2493,7 @@ This is like `dired-recursive-delete-directory' for Tramp files." (filename switches &optional wildcard full-directory-p) "Like `insert-directory' for Tramp files." (setq filename (expand-file-name filename)) + (unless switches (setq switches "")) (with-parsed-tramp-file-name filename nil (if (and (featurep 'ls-lisp) (not (symbol-value 'ls-lisp-use-insert-directory-program))) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index d0989e79cd3..966a77a2f78 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -884,7 +884,7 @@ See also `tramp-file-name-regexp'.") ;;;###autoload (defconst tramp-file-name-regexp-unified (if (memq system-type '(cygwin windows-nt)) - "\\`/[^/|:]\\{2,\\}[^/|]*:" + "\\`/\\(\\[.*\\]\\|[^/|:]\\{2,\\}[^/|]*\\):" "\\`/[^/|:][^/|]*:") "Value for `tramp-file-name-regexp' for unified remoting. Emacs (not XEmacs) uses a unified filename syntax for Ange-FTP and -- 2.11.4.GIT