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

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 36b146f59ba6aec4266c836de836709fc26ec022..b4037a5d772633435c9f2fd0791a2363a703f20a 100644 (file)
--- 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 723eba0a93becdc34ac16f2aff5211b42a1e5924..fb1243892788dd7a4785f1a5ac1e7c0e8241f9c7 100644 (file)
--- 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