* net/tramp.el (tramp-handle-write-region): Fix check for short

track.  Reported by Glenn Morris <rgm@gnu.org>.

2 files changed, 9 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 36b146f59ba..b4037a5d772 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-16  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-handle-write-region): Fix check for short
+        track.  Reported by Glenn Morris <rgm@gnu.org>.
+
 2008-05-16  Eric S. Raymond  <esr@snark.thyrsus.com>
 
         * vc.el: Remove my analysis of SCCS/RCS concurrency issues from
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 723eba0a93b..fb124389278 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -4185,9 +4185,10 @@ Returns a file name in `tramp-auto-save-directory' for autosaving this file."
                ;; `file-writable-p' calls 'file-expand-file-name'.  We
                ;; cannot use `tramp-run-real-handler' therefore.
                (let (file-name-handler-alist)
-                 (file-writable-p (file-name-directory localname))
-                 (or (file-directory-p localname)
-                     (file-writable-p localname))))
+                 (and
+                  (file-writable-p (file-name-directory localname))
+                  (or (file-directory-p localname)
+                      (file-writable-p localname)))))
           ;; Short track: if we are on the local host, we can run directly.
           (tramp-run-real-handler
            'write-region