Make `dired-diff' more safe. (Bug#5225)

[bpt/emacs.git] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 26ff5d4..c2a1664 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,24 @@
+2009-12-17  Juri Linkov  <juri@jurta.org>
+
+       Make `dired-diff' more safe.  (Bug#5225)
+
+       * dired-aux.el (dired-diff): Signal an error when `file' equals to
+       `current' or when `file' is a directory of the `current' file.
+
+2009-12-17  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * emacs-lisp/autoload.el (batch-update-autoloads): Only exclude
+       unconditionally preloaded files.
+
+2009-12-16  Juri Linkov  <juri@jurta.org>
+
+       Revert to old 23.1 logic of using the file at the mark as default.
+       * dired-aux.el (dired-diff): Use the file at the mark as default
+       if it's not the same as the current file, and the target dir is
+       the current dir or the mark is active.  Add the current file
+       as the arg of `dired-dwim-target-defaults'.  Use the default file
+       in the prompt.  (Bug#5225)
+
 2009-12-15  Michael Albinus  <michael.albinus@gmx.de>
 
        * net/tramp.el (tramp-echo-mark-marker-length): New defconst.