[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp/net tramp.el
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] emacs/lisp/net tramp.el |
Date: |
Sun, 05 Apr 2009 18:06:56 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Michael Albinus <albinus> 09/04/05 18:06:56
Modified files:
lisp/net : tramp.el
Log message:
* net/tramp.el (tramp-default-file-modes) New defun. Replace all
calls of `file-modes' by this.
(tramp-handle-find-backup-file-name): Use `symbol-value' instead
of `boundp'.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/net/tramp.el?cvsroot=emacs&r1=1.229&r2=1.230
Patches:
Index: tramp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/tramp.el,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -b -r1.229 -r1.230
--- tramp.el 26 Feb 2009 14:28:45 -0000 1.229
+++ tramp.el 5 Apr 2009 18:06:55 -0000 1.230
@@ -2763,6 +2763,12 @@
(when (file-exists-p truename)
(tramp-mode-string-to-int (nth 8 (file-attributes truename))))))
+(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)))
+
(defun tramp-handle-file-directory-p (filename)
"Like `file-directory-p' for Tramp files."
;; Care must be taken that this function returns `t' for symlinks
@@ -3177,7 +3183,7 @@
;; KEEP-DATE handling.
(when keep-date (set-file-times newname (nth 5 (file-attributes filename))))
;; Set the mode.
- (set-file-modes newname (file-modes filename))
+ (set-file-modes newname (tramp-default-file-modes filename))
;; If the operation was `rename', delete the original file.
(unless (eq op 'copy) (delete-file filename)))
@@ -3314,7 +3320,7 @@
(condition-case nil
(when (and keep-date (not preserve-uid-gid))
(set-file-times newname (nth 5 (file-attributes filename)))
- (set-file-modes newname (file-modes filename)))
+ (set-file-modes newname (tramp-default-file-modes filename)))
(error)))))
(defun tramp-do-copy-or-rename-file-out-of-band (op filename newname keep-date)
@@ -3414,7 +3420,7 @@
;; Set the mode.
(unless (and keep-date copy-keep-date)
- (set-file-modes newname (file-modes filename))))
+ (set-file-modes newname (tramp-default-file-modes filename))))
;; If the operation was `rename', delete the original file.
(unless (eq op 'copy)
@@ -4072,7 +4078,7 @@
(tramp-message v 5 "Decoding remote file %s...done" filename)
;; Set proper permissions.
- (set-file-modes tmpfile (file-modes filename))
+ (set-file-modes tmpfile (tramp-default-file-modes filename))
;; Set local user ownership.
(tramp-set-file-uid-gid tmpfile)))
@@ -4210,7 +4216,7 @@
(let ((backup-directory-alist
;; Emacs case
(when (boundp 'backup-directory-alist)
- (if (boundp 'tramp-backup-directory-alist)
+ (if (symbol-value 'tramp-backup-directory-alist)
(mapcar
'(lambda (x)
(cons
@@ -4226,7 +4232,7 @@
(bkup-backup-directory-info
;; XEmacs case
(when (boundp 'bkup-backup-directory-info)
- (if (boundp 'tramp-bkup-backup-directory-info)
+ (if (symbol-value 'tramp-bkup-backup-directory-info)
(mapcar
'(lambda (x)
(nconc
@@ -4333,7 +4339,7 @@
(let ((rem-dec (tramp-get-remote-coding v "remote-decoding"))
(loc-enc (tramp-get-local-coding v "local-encoding"))
- (modes (save-excursion (file-modes filename)))
+ (modes (save-excursion (tramp-default-file-modes filename)))
;; We use this to save the value of
;; `last-coding-system-used' after writing the tmp file.
;; At the end of the function, we set
- [Emacs-diffs] emacs/lisp/net tramp.el,
Michael Albinus <=