Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-24 13:57:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert to old 23.1 logic of using the file at the mark as default.

Browse source 
* 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)
This commit is contained in:
Juri Linkov 2009-12-16 09:52:42 +00:00
parent 7eeb56addb
commit 72b5756030
2 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lisp/ChangeLog
View file

@ -1,3 +1,12 @@
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.

28
lisp/dired-aux.el
View file

@ -60,21 +60,31 @@ With prefix arg, prompt for second argument SWITCHES,
which is options for `diff'."
(interactive
(let* ((current (dired-get-filename t))
(target-dir (dired-dwim-target-directory))
(marked (and (mark t) (save-excursion
(goto-char (mark t))
(dired-get-filename nil t))))
(defaults
(append (dired-dwim-target-defaults nil target-dir)
;; Additional file with the mark.
(and marked (list marked)))))
;; Get the file at the mark.
(file-at-mark (if (mark t)
(save-excursion (goto-char (mark t))
(dired-get-filename t t))))
;; Use it 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.
(default (if (and (not (equal file-at-mark current))
(or (equal (dired-dwim-target-directory)
(dired-current-directory))
mark-active))
file-at-mark))
(target-dir (if default
(dired-current-directory)
(dired-dwim-target-directory)))
(defaults (dired-dwim-target-defaults (list current) target-dir)))
(require 'diff)
(list
(minibuffer-with-setup-hook
(lambda ()
(set (make-local-variable 'minibuffer-default-add-function) nil)
(setq minibuffer-default defaults))
(read-file-name (format "Diff %s with: " current) target-dir nil t))
(read-file-name
(format "Diff %s with%s: " current
(if default (format " (default %s)" default) ""))
target-dir default t))
(if current-prefix-arg
(read-string "Options for diff: "
(if (stringp diff-switches)