# HG changeset patch
# User Juri Linkov <juri@jurta.org>
# Date 1137462112 0
# Node ID adf40b463f96da2ac1ab03bc359257c1df6df97f
# Parent  e0ed492c53d1e876cb8068b675a8f325a3861764
(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.

diff -r e0ed492c53d1 -r adf40b463f96 lisp/dired-aux.el
--- a/lisp/dired-aux.el	Tue Jan 17 00:57:41 2006 +0000
+++ b/lisp/dired-aux.el	Tue Jan 17 01:41:52 2006 +0000
@@ -53,14 +53,20 @@
 \\[set-mark-command], not by Dired's \\[dired-mark] command.)
 The prompted-for file is the first file given to `diff'.
 With prefix arg, prompt for second argument SWITCHES,
- which is options for `diff'."
+which is options for `diff'."
   (interactive
-   (let ((default (if (mark t)
+   (let ((current (dired-get-filename t))
+	 (default (if (mark t)
 		      (save-excursion (goto-char (mark t))
 				      (dired-get-filename t t)))))
+     (if (or (equal default current)
+	     (and (not (equal (dired-dwim-target-directory)
+			      (dired-current-directory)))
+		  (not mark-active)))
+	 (setq default nil))
      (require 'diff)
      (list (read-file-name (format "Diff %s with%s: "
-				   (dired-get-filename t)
+				   current
 				   (if default
 				       (concat " (default " default ")")
 				     ""))