# HG changeset patch
# User Juri Linkov <juri@jurta.org>
# Date 1137462180 0
# Node ID 8cac036adedc772086cb8258cb4ba8234642366b
# Parent  adf40b463f96da2ac1ab03bc359257c1df6df97f
*** empty log message ***

diff -r adf40b463f96 -r 8cac036adedc lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Jan 17 01:41:52 2006 +0000
+++ b/lisp/ChangeLog	Tue Jan 17 01:43:00 2006 +0000
@@ -1,5 +1,10 @@
 2006-01-17  Juri Linkov  <juri@jurta.org>
 
+	* dired-aux.el (dired-diff): Use dired-dwim-target-directory
+	instead of the file at the mark as default if the file at the mark
+	is the same as the file at point or if dired-dwim-target-directory
+	is not the same as the current directory and the mark is not active.
+
 	* log-view.el (log-view-minor-wrap): Use the same logic to get
 	revisions as `log-view-diff'.