aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2004-05-01 05:38:07 +0000
committerJuri Linkov2004-05-01 05:38:07 +0000
commit4ae73f87a0f3ab6f9b7cdca19a3df40d945fc7a9 (patch)
treebd7bb50e60927a8d167559f6d0feb0910e7436e5
parent7017c8174e3c2132b2e2cf4b77cb80c4c59aadc1 (diff)
downloademacs-4ae73f87a0f3ab6f9b7cdca19a3df40d945fc7a9.tar.gz
emacs-4ae73f87a0f3ab6f9b7cdca19a3df40d945fc7a9.zip
(dired-diff): Use `dired-dwim-target-directory'
if current dired buffer has no buffer mark.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/dired-aux.el5
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eecf77f488b..4b61e5ceabb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -14,6 +14,8 @@
14 14
15 * dired-aux.el (dired-touch-initial): New fun. 15 * dired-aux.el (dired-touch-initial): New fun.
16 (dired-do-chxxx): Call it for op-symbol `touch'. 16 (dired-do-chxxx): Call it for op-symbol `touch'.
17 (dired-diff): Use `dired-dwim-target-directory'
18 if current dired buffer has no buffer mark.
17 19
18 * bindings.el (propertized-buffer-identification): 20 * bindings.el (propertized-buffer-identification):
19 Replace `(:weight bold)' by `Buffer-menu-buffer-face'. 21 Replace `(:weight bold)' by `Buffer-menu-buffer-face'.
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index dbc3d763040..b31d20782f3 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -64,7 +64,10 @@ With prefix arg, prompt for second argument SWITCHES,
64 (if default 64 (if default
65 (concat "(default " default ") ") 65 (concat "(default " default ") ")
66 "")) 66 ""))
67 (dired-current-directory) default t) 67 (if default
68 (dired-current-directory)
69 (dired-dwim-target-directory))
70 default t)
68 (if current-prefix-arg 71 (if current-prefix-arg
69 (read-string "Options for diff: " 72 (read-string "Options for diff: "
70 (if (stringp diff-switches) 73 (if (stringp diff-switches)