diff options
| author | Michael Albinus | 2008-06-29 16:53:46 +0000 |
|---|---|---|
| committer | Michael Albinus | 2008-06-29 16:53:46 +0000 |
| commit | 8e303a2fe1b412d30939e5ea656f513816ed2386 (patch) | |
| tree | 026775c3804d7d3067455bfa3a2e94b7d4a163b7 | |
| parent | 4e179b19575bdcf0d02cbb040e72e7850e76bb09 (diff) | |
| download | emacs-8e303a2fe1b412d30939e5ea656f513816ed2386.tar.gz emacs-8e303a2fe1b412d30939e5ea656f513816ed2386.zip | |
* net/tramp-ftp.el (tramp-ftp-file-name-handler): Revert patch
from 2008-06-28. It does not work on W32.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/tramp-ftp.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 58b1e461e48..b550cdcc481 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2008-06-29 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * net/tramp-ftp.el (tramp-ftp-file-name-handler): Revert patch | ||
| 4 | from 2008-06-28. It does not work on W32. | ||
| 5 | |||
| 1 | 2008-06-29 Juri Linkov <juri@jurta.org> | 6 | 2008-06-29 Juri Linkov <juri@jurta.org> |
| 2 | 7 | ||
| 3 | * replace.el (read-regexp): New function. | 8 | * replace.el (read-regexp): New function. |
diff --git a/lisp/net/tramp-ftp.el b/lisp/net/tramp-ftp.el index 5ad73a7d4b6..b05add13cd9 100644 --- a/lisp/net/tramp-ftp.el +++ b/lisp/net/tramp-ftp.el | |||
| @@ -189,7 +189,7 @@ pass to the OPERATION." | |||
| 189 | ;; local file name could be in Tramp syntax as well (for | 189 | ;; local file name could be in Tramp syntax as well (for |
| 190 | ;; example, returning VMS file names like "/DISK$CAM:/AAA"). | 190 | ;; example, returning VMS file names like "/DISK$CAM:/AAA"). |
| 191 | ;; That's why we set also `tramp-mode' to nil. | 191 | ;; That's why we set also `tramp-mode' to nil. |
| 192 | (t (let* ((tramp-mode nil) | 192 | (t (let* (;(tramp-mode nil) |
| 193 | (inhibit-file-name-handlers | 193 | (inhibit-file-name-handlers |
| 194 | (list 'tramp-file-name-handler | 194 | (list 'tramp-file-name-handler |
| 195 | 'tramp-completion-file-name-handler | 195 | 'tramp-completion-file-name-handler |