[Emacs-diffs] trunk r115243: * net/tramp.el (tramp-file-name-regexp-unified): Support IPv6 host

[Michael Albinus]

------------------------------------------------------------
revno: 115243
revision-id: address@hidden
parent: address@hidden
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Tue 2013-11-26 16:07:10 +0100
message:
  * 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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/tramp-sh.el           trampsh.el-20100913133439-a1faifh29eqoi4nh-1
  lisp/net/tramp.el              tramp.el-20091113204419-o5vbwnq5f7feedwu-2427

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-11-26 10:38:19 +0000
+++ b/lisp/ChangeLog    2013-11-26 15:07:10 +0000
@@ -1,3 +1,11 @@
+2013-11-26  Michael Albinus  <address@hidden>
+
+       * 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  <address@hidden>
 
        * progmodes/python.el (python-indent-guess-indent-offset):

=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el      2013-11-15 07:37:18 +0000
+++ b/lisp/net/tramp-sh.el      2013-11-26 15:07:10 +0000
@@ -2493,6 +2493,7 @@
   (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)))

=== modified file 'lisp/net/tramp.el'
--- a/lisp/net/tramp.el 2013-11-13 15:28:06 +0000
+++ b/lisp/net/tramp.el 2013-11-26 15:07:10 +0000
@@ -884,7 +884,7 @@
 ;;;###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