* 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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 25dcbc67ab798adfa5b3e6b77a0f59900dd43c7a..c8a341483bc4f88b67f24e184d25d99b5e49f206 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2013-11-26  Michael Albinus  <michael.albinus@gmx.de>
+
+       * 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  <rgm@gnu.org>
 
        * progmodes/python.el (python-indent-guess-indent-offset):

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 874e50fbfaabd7ea9c7e922754439239d35e3f3a..455ea1d4e9e65d69cfb9b044763d23b1a31b664a 100644 (file)
--- 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 d0989e79cd3f35892dadf63426057a62fc623c27..966a77a2f78b9f10400e4134e5967f91501630c7 100644 (file)
--- 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