diff options
| author | Michael Albinus | 2010-04-22 06:30:16 +0200 |
|---|---|---|
| committer | Michael Albinus | 2010-04-22 06:30:16 +0200 |
| commit | 489fe4c2ea3f7b1a7165a2387b5e018f69520f1b (patch) | |
| tree | 424a326a7efc1a8672dc624106eb82e7ab793dfd | |
| parent | cdbce48ee46bf088e7cc6fc3517c51f1d718ad74 (diff) | |
| download | emacs-489fe4c2ea3f7b1a7165a2387b5e018f69520f1b.tar.gz emacs-489fe4c2ea3f7b1a7165a2387b5e018f69520f1b.zip | |
* net/tramp.el(tramp-completion-handle-file-name-all-completions):
Ensure, that non remote files are still checked. Oops.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ad8f74c7489..e701f59554b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-04-22 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * net/tramp.el (tramp-completion-handle-file-name-all-completions): | ||
| 4 | Ensure, that non remote files are still checked. Oops. | ||
| 5 | |||
| 1 | 2010-04-21 Michael Albinus <michael.albinus@gmx.de> | 6 | 2010-04-21 Michael Albinus <michael.albinus@gmx.de> |
| 2 | 7 | ||
| 3 | Fix Bug#5840. | 8 | Fix Bug#5840. |
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 5ba1b184bc5..05f7b94edda 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el | |||
| @@ -5719,9 +5719,10 @@ not in completion mode." | |||
| 5719 | (append | 5719 | (append |
| 5720 | result1 | 5720 | result1 |
| 5721 | (condition-case nil | 5721 | (condition-case nil |
| 5722 | (when (tramp-connectable-p fullname) | 5722 | (apply (if (tramp-connectable-p fullname) |
| 5723 | (tramp-completion-run-real-handler | 5723 | 'tramp-completion-run-real-handler |
| 5724 | 'file-name-all-completions (list filename directory))) | 5724 | 'tramp-run-real-handler) |
| 5725 | 'file-name-all-completions (list (list filename directory))) | ||
| 5725 | (error nil))))) | 5726 | (error nil))))) |
| 5726 | 5727 | ||
| 5727 | ;; Method, host name and user name completion for a file. | 5728 | ;; Method, host name and user name completion for a file. |