diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2007-10-31 18:14:41 +0000 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2007-10-31 18:14:41 +0000 |
| commit | 89242dda1535be54a1540858b17e4444147e496c (patch) | |
| tree | dbe1f96ede0be33aa16361e06811fa3f9c1a922d /lisp | |
| parent | 6341c3fc0b4da35afa56b6c2008a4b56201ef9a9 (diff) | |
| download | emacs-89242dda1535be54a1540858b17e4444147e496c.tar.gz | |
(dired-copy-file-recursive): Preserve directory permissions.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/dired-aux.el | 13 |
2 files changed, 14 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2ab695c5bdd..e1720346d26 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-10-31 Sven Joachim <svenjoac@gmx.de> + + * dired-aux.el (dired-copy-file-recursive): + Preserve directory permissions. + 2007-10-31 Juanma Barranquero <lekktu@gmail.com> * whitespace.el (whitespace-write-file-hook): Remove interactive spec. diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index 4d9849cd534..8d0f184eb7c 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el @@ -1162,7 +1162,8 @@ Special value `always' suppresses confirmation." (or (eq recursive 'always) (yes-or-no-p (format "Recursive copies of %s? " from)))) ;; This is a directory. - (let ((files + (let ((mode (file-modes from)) + (files (condition-case err (directory-files from nil dired-re-no-dot) (file-error @@ -1176,7 +1177,9 @@ Special value `always' suppresses confirmation." (if (file-exists-p to) (or top (dired-handle-overwrite to)) (condition-case err - (make-directory to) + (progn + (make-directory to) + (set-file-modes to #o700)) (file-error (push (dired-make-relative from) dired-create-files-failures) @@ -1195,7 +1198,9 @@ Special value `always' suppresses confirmation." (file-error (push (dired-make-relative thisfrom) dired-create-files-failures) - (dired-log "Copying error for %s:\n%s\n" thisfrom err)))))) + (dired-log "Copying error for %s:\n%s\n" thisfrom err))))) + (when (file-directory-p to) + (set-file-modes to mode))) ;; Not a directory. (or top (dired-handle-overwrite to)) (condition-case err @@ -1203,7 +1208,7 @@ Special value `always' suppresses confirmation." ;; It is a symlink (make-symbolic-link (car attrs) to ok-flag) (copy-file from to ok-flag dired-copy-preserve-time)) - (file-date-error + (file-date-error (push (dired-make-relative from) dired-create-files-failures) (dired-log "Can't set date on %s:\n%s\n" from err)))))) |