[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/dired-aux.el,v
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/dired-aux.el,v |
Date: |
Sun, 06 Apr 2008 00:03:39 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 08/04/06 00:03:39
Index: dired-aux.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/dired-aux.el,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -b -r1.164 -r1.165
--- dired-aux.el 26 Mar 2008 03:34:06 -0000 1.164
+++ dired-aux.el 6 Apr 2008 00:03:38 -0000 1.165
@@ -1179,23 +1179,22 @@
(other :tag "ask" t))
:group 'dired)
-(defvar dired-overwrite-confirmed)
+(defvar dired-overwrite-confirmed nil)
(defun dired-handle-overwrite (to)
;; Save old version of file TO that is to be overwritten.
;; `dired-overwrite-confirmed' and `overwrite-backup-query' are fluid vars
;; from dired-create-files.
(let (backup)
- (if (and dired-backup-overwrite
+ (when (and dired-backup-overwrite
dired-overwrite-confirmed
(setq backup (car (find-backup-file-name to)))
(or (eq 'always dired-backup-overwrite)
(dired-query 'overwrite-backup-query
"Make backup for existing file `%s'? "
to)))
- (progn
(rename-file to backup 0) ; confirm overwrite of old backup
- (dired-relist-entry backup)))))
+ (dired-relist-entry backup))))
;;;###autoload
(defun dired-copy-file (from to ok-flag)
- [Emacs-diffs] Changes to emacs/lisp/dired-aux.el,v,
Chong Yidong <=
- [Emacs-diffs] Changes to emacs/lisp/dired-aux.el,v, Chong Yidong, 2008/04/06
- [Emacs-diffs] Changes to emacs/lisp/dired-aux.el,v, Stefan Monnier, 2008/04/07
- [Emacs-diffs] Changes to emacs/lisp/dired-aux.el,v, Stefan Monnier, 2008/04/10
- [Emacs-diffs] Changes to emacs/lisp/dired-aux.el,v, Juri Linkov, 2008/04/22