aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Großjohann2004-06-26 15:28:33 +0000
committerKai Großjohann2004-06-26 15:28:33 +0000
commit15cc764cd1a590eccf9516effbe28df61c78a02a (patch)
tree0d2249bf27a3a4a618a2ec525b3505eeef157a57
parentf3e6add22d05a143df590785a7e8dd98a337877a (diff)
downloademacs-15cc764cd1a590eccf9516effbe28df61c78a02a.tar.gz
emacs-15cc764cd1a590eccf9516effbe28df61c78a02a.zip
(tramp-handle-file-remote-p): New implementation to
agree with new return value of `file-remote-p'. This syncs with Tramp 2.0.42.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/net/tramp.el9
2 files changed, 12 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 69ba9cc6b82..bf7e4aa4e19 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
12004-06-26 Kai Grossjohann <kai.grossjohann@gmx.net> 12004-06-26 Kai Grossjohann <kai.grossjohann@gmx.net>
2 2
3 * net/tramp.el (tramp-handle-file-remote-p): New implementation to
4 agree with new return value of `file-remote-p'.
5 This syncs with Tramp 2.0.42.
6
3 * net/ange-ftp.el (ange-ftp-file-remote-p): New return value, 7 * net/ange-ftp.el (ange-ftp-file-remote-p): New return value,
4 according to new documentation of `file-remote-p'. 8 according to new documentation of `file-remote-p'.
5 9
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 769ad3f51f6..0414859c7eb 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3542,7 +3542,14 @@ This will break if COMMAND prints a newline, followed by the value of
3542 3542
3543(defun tramp-handle-file-remote-p (filename) 3543(defun tramp-handle-file-remote-p (filename)
3544 "Like `file-remote-p' for tramp files." 3544 "Like `file-remote-p' for tramp files."
3545 (when (tramp-tramp-file-p filename) t)) 3545 (when (tramp-tramp-file-p filename)
3546 (with-parsed-tramp-file-name filename nil
3547 (make-tramp-file-name
3548 :multi-method multi-method
3549 :method method
3550 :user user
3551 :host host
3552 :localname ""))))
3546 3553
3547(defun tramp-handle-insert-file-contents 3554(defun tramp-handle-insert-file-contents
3548 (filename &optional visit beg end replace) 3555 (filename &optional visit beg end replace)