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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 17a21d0b4fa42dee31d05d8c99eb14bc88593792..bd1e3beef145d04e297a8a3e7ccd39e62a4b9f4a 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.
 
        * net/tramp-gvfs.el (tramp-gvfs-methods): Add "synce" method.
        (tramp-gvfs-connection-mounted-p): Handle empty user name for

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 9da9e314cd2c0e4a2699b547d93d7256add2edbd..84776f7f256624b08402009ca0e9ab29eb1b5a0a 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -2789,8 +2789,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."