From: Michael Albinus <michael.albinus@gmx.de>
Date: Tue, 30 Jun 2009 15:23:50 +0000 (+0000)
Subject: * net/tramp.el (tramp-default-file-modes) Remove execute permissions.
X-Git-Tag: emacs-pretest-23.1.90~2381
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=974647ac913e1280e7142321a19e3b7eaabefc25;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 17a21d0b4fa..bd1e3beef14 100644
--- 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 9da9e314cd2..84776f7f256 100644
--- 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."