* 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.
This commit is contained in:
Michael Albinus 2013-11-26 16:07:10 +01:00
parent 4e9fc48c06
commit 5fbf6856db
3 changed files with 10 additions and 1 deletions

View file

@ -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):

View file

@ -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)))

View file

@ -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