Mercurial > emacs
changeset 109497:c40b94d7d47b
* net/tramp.el (tramp-file-name-regexp-unified)
(tramp-completion-file-name-regexp-unified): On W32 systems, do
not regard the volume letter as remote filename. (Bug#5447)
| author | Michael Albinus <michael.albinus@gmx.de> |
|---|---|
| date | Fri, 23 Jul 2010 15:31:56 +0200 |
| parents | bf6283e6c0a3 |
| children | 78dcd5cace97 |
| files | lisp/ChangeLog lisp/net/tramp.el |
| diffstat | 2 files changed, 18 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Jul 23 12:32:02 2010 +0200 +++ b/lisp/ChangeLog Fri Jul 23 15:31:56 2010 +0200 @@ -1,3 +1,9 @@ +2010-07-23 Michael Albinus <michael.albinus@gmx.de> + + * net/tramp.el (tramp-file-name-regexp-unified) + (tramp-completion-file-name-regexp-unified): On W32 systems, do + not regard the volume letter as remote filename. (Bug#5447) + 2010-07-23 Juanma Barranquero <lekktu@gmail.com> * custom.el (custom-declare-variable): Give a clearer error message
--- a/lisp/net/tramp.el Fri Jul 23 12:32:02 2010 +0200 +++ b/lisp/net/tramp.el Fri Jul 23 15:31:56 2010 +0200 @@ -1444,10 +1444,14 @@ ;;;###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 -Tramp. See `tramp-file-name-structure' for more explanations.") +Tramp. See `tramp-file-name-structure' for more explanations. + +On W32 systems, the volume letter must be ignored.") ;;;###autoload (defconst tramp-file-name-regexp-separate @@ -1494,10 +1498,14 @@ ;;;###autoload (defconst tramp-completion-file-name-regexp-unified - (concat tramp-root-regexp "[^/]*\\'") + (if (memq system-type '(cygwin windows-nt)) + (concat tramp-root-regexp "[^/]\\{2,\\}\\'") + (concat tramp-root-regexp "[^/]*\\'")) "Value for `tramp-completion-file-name-regexp' for unified remoting. GNU Emacs uses a unified filename syntax for Tramp and Ange-FTP. -See `tramp-file-name-structure' for more explanations.") +See `tramp-file-name-structure' for more explanations. + +On W32 systems, the volume letter must be ignored.") ;;;###autoload (defconst tramp-completion-file-name-regexp-separate @@ -8953,7 +8961,6 @@ ;; expects English? Or just to set LC_MESSAGES to "C" if Tramp ;; expects only English messages? (Juri Linkov) ;; * Make shadowfile.el grok Tramp filenames. (Bug#4526, Bug#4846) -;; * Do not handle files with drive letter as remote. (Bug#5447) ;; * Load Tramp subpackages only when needed. (Bug#1529, Bug#5448, Bug#5705) ;; * Try telnet+curl as new method. It might be useful for busybox, ;; without built-in uuencode/uudecode.