Commit 5fbf6856 authored by Michael Albinus's avatar Michael Albinus
Browse files

* 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.
parent 4e9fc48c
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> 2013-11-26 Glenn Morris <rgm@gnu.org>
* progmodes/python.el (python-indent-guess-indent-offset): * progmodes/python.el (python-indent-guess-indent-offset):
......
...@@ -2493,6 +2493,7 @@ This is like `dired-recursive-delete-directory' for Tramp files." ...@@ -2493,6 +2493,7 @@ This is like `dired-recursive-delete-directory' for Tramp files."
(filename switches &optional wildcard full-directory-p) (filename switches &optional wildcard full-directory-p)
"Like `insert-directory' for Tramp files." "Like `insert-directory' for Tramp files."
(setq filename (expand-file-name filename)) (setq filename (expand-file-name filename))
(unless switches (setq switches ""))
(with-parsed-tramp-file-name filename nil (with-parsed-tramp-file-name filename nil
(if (and (featurep 'ls-lisp) (if (and (featurep 'ls-lisp)
(not (symbol-value 'ls-lisp-use-insert-directory-program))) (not (symbol-value 'ls-lisp-use-insert-directory-program)))
......
...@@ -884,7 +884,7 @@ See also `tramp-file-name-regexp'.") ...@@ -884,7 +884,7 @@ See also `tramp-file-name-regexp'.")
;;;###autoload ;;;###autoload
(defconst tramp-file-name-regexp-unified (defconst tramp-file-name-regexp-unified
(if (memq system-type '(cygwin windows-nt)) (if (memq system-type '(cygwin windows-nt))
"\\`/[^/|:]\\{2,\\}[^/|]*:" "\\`/\\(\\[.*\\]\\|[^/|:]\\{2,\\}[^/|]*\\):"
"\\`/[^/|:][^/|]*:") "\\`/[^/|:][^/|]*:")
"Value for `tramp-file-name-regexp' for unified remoting. "Value for `tramp-file-name-regexp' for unified remoting.
Emacs (not XEmacs) uses a unified filename syntax for Ange-FTP and Emacs (not XEmacs) uses a unified filename syntax for Ange-FTP and
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment