diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2009-12-03 11:34:11 +0000 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2009-12-03 11:34:11 +0000 |
| commit | a09dc9bf9c3c40638d3fe6bf1905de05d7dac6fb (patch) | |
| tree | 8f271dddbc5629879fa1e0c6aa4dfb84dbaef5ab /lisp/net/tramp.el | |
| parent | 228fb9b59ea7328f34c799835ae6dd9310a49f25 (diff) | |
| download | emacs-a09dc9bf9c3c40638d3fe6bf1905de05d7dac6fb.tar.gz | |
Cleanup.
* eshell/em-unix.el (top): Require 'esh-opt and 'pcomplete.
(eshell/su, eshell/sudo): Require 'tramp. Fix problems reading
arguments. Expand `default-directory'.
* net/tramp.el (tramp-handle-file-remote-p): Expand FILENAME for
the benefit of returning an expanded localname.
(tramp-tramp-file-p): Handle the case NAME is not a string.
Diffstat (limited to 'lisp/net/tramp.el')
| -rw-r--r-- | lisp/net/tramp.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 678c8cc22e0..f3297ed13f5 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -4629,7 +4629,7 @@ Lisp error raised when PROGRAM is nil is trapped also, returning 1." (defun tramp-handle-file-remote-p (filename &optional identification connected) "Like `file-remote-p' for Tramp files." (when (tramp-tramp-file-p filename) - (with-parsed-tramp-file-name filename nil + (with-parsed-tramp-file-name (expand-file-name filename) nil (and (or (not connected) (let ((p (tramp-get-connection-process v))) (and p (processp p) (memq (process-status p) '(run open))))) @@ -7709,9 +7709,9 @@ Not actually used. Use `(format \"%o\" i)' instead?" (string-to-number (match-string 2 host)))))) (defun tramp-tramp-file-p (name) - "Return t if NAME is a Tramp file." + "Return t if NAME is a string with Tramp file name syntax." (save-match-data - (string-match tramp-file-name-regexp name))) + (and (stringp name) (string-match tramp-file-name-regexp name)))) (defun tramp-find-method (method user host) "Return the right method string to use. |