* dired-aux.el (dired-overwrite-confirmed): Revert last change.

* dired.el (dired-dnd-handle-local-file): Obey
dired-backup-overwrite.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 91bc68ddbde39601c8b72c8e889b2e9ad494ea3b..87784c092b0181a8edf1a3f7823c7186129f5fda 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,12 +1,19 @@
+2008-04-06  Chong Yidong  <cyd@stupidchicken.com>
+
+       * dired-aux.el (dired-overwrite-confirmed): Revert last change.
+
+       * dired.el (dired-dnd-handle-local-file): Obey
+       dired-backup-overwrite.
+
 2008-04-06  Michael Kifer  <kifer@cs.stonybrook.edu>
-       
+
        * viper*.el (viper-search-wrap-around-t): replace with
        viper-search-wrap-around.
-       
+
        * ediff*.el: replace 3-argument 'require' statements with 1-argument
        ones (wrapped in if's). For compatibility with the current stable
        version of XEmacs.
-       
+
 2008-04-06  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * vc.el (vc-status-prepare-status-buffer):