* net/tramp.el (tramp-default-file-modes) Remove execute permissions.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bf5ef0bdd7b825a434e88d915d42d0569a88be2d..5f885e478b1a9758a1fcae3a022f5e0f7dd32cff 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,7 @@
 
        * net/tramp.el (tramp-do-copy-or-rename-file-directly): Handle
        also the 'rename case, when setting file modes.  (Bug#3712)
+       (tramp-default-file-modes) Remove execute permissions.
 
 2009-06-29  Alan Mackenzie  <acm@muc.de>
 

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index cf1f866cb2cf62c22e2b45493dd7f913dc6a68ef..517485a1d655a8cd7ec3123059c39b5d2cbb2ff6 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -2767,8 +2767,9 @@ and gid of the corresponding user is taken.  Both parameters must be integers."
 (defun tramp-default-file-modes (filename)
   "Return file modes of FILENAME as integer.
 If the file modes of FILENAME cannot be determined, return the
-value of `default-file-modes'."
-  (or (file-modes filename) (default-file-modes)))
+value of `default-file-modes', without execute permissions."
+  (or (file-modes filename)
+      (logand (default-file-modes) (tramp-octal-to-decimal "0666"))))
 
 (defun tramp-handle-file-directory-p (filename)
   "Like `file-directory-p' for Tramp files."