[Emacs-diffs] emacs etc/NEWS lisp/ChangeLog lisp/dired-aux.el...

[Juri Linkov]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juri Linkov <jurta>     09/11/25 17:15:25

Modified files:
        etc            : NEWS 
        lisp           : ChangeLog dired-aux.el ediff-util.el 

Log message:
        Provide additional default values (directories at other Dired
        windows) via M-n in the minibuffer of some Dired commands.
        
        * dired-aux.el (dired-diff, dired-compare-directories)
        (dired-do-create-files): Use `dired-dwim-target-defaults' to set
        `minibuffer-default' in `minibuffer-with-setup-hook'.
        (dired-dwim-target-directory): Find a window that displays Dired
        buffer instead of failing when the next window is not Dired.
        Use `get-window-with-predicate' to find for the next Dired window.
        (dired-dwim-target-defaults): New function.
        
        * ediff-util.el (ediff-read-file-name):
        Use `dired-dwim-target-defaults' to set `minibuffer-default'
        in `minibuffer-with-setup-hook'.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/etc/NEWS?cvsroot=emacs&r1=1.2124&r2=1.2125
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16732&r2=1.16733
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/dired-aux.el?cvsroot=emacs&r1=1.198&r2=1.199
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ediff-util.el?cvsroot=emacs&r1=1.100&r2=1.101

Patches:
Index: etc/NEWS
===================================================================
RCS file: /sources/emacs/emacs/etc/NEWS,v
retrieving revision 1.2124
retrieving revision 1.2125
diff -u -b -r1.2124 -r1.2125
--- etc/NEWS    25 Nov 2009 17:11:29 -0000      1.2124
+++ etc/NEWS    25 Nov 2009 17:15:19 -0000      1.2125
@@ -152,7 +152,9 @@
 
 ** M-n provides more default values in the minibuffer of commands that
 read a file and directory name: a file name at point (when ffap is loaded
-without ffap-bindings), a file name on the current line in the Dired buffer.
+without ffap-bindings), a file name on the current line in the Dired buffer,
+a directory name of adjacent Dired windows for Dired commands that can
+operate on several directories (copy, rename, diff).
 
 ** M-r is bound to the new `move-to-window-line-top-bottom'
 to mirror the new behavior of C-l in Emacs-23.1.

Index: lisp/ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16732
retrieving revision 1.16733
diff -u -b -r1.16732 -r1.16733
--- lisp/ChangeLog      25 Nov 2009 17:11:31 -0000      1.16732
+++ lisp/ChangeLog      25 Nov 2009 17:15:21 -0000      1.16733
@@ -1,5 +1,22 @@
 2009-11-25  Juri Linkov  <address@hidden>
 
+       Provide additional default values (directories at other Dired
+       windows) via M-n in the minibuffer of some Dired commands.
+
+       * dired-aux.el (dired-diff, dired-compare-directories)
+       (dired-do-create-files): Use `dired-dwim-target-defaults' to set
+       `minibuffer-default' in `minibuffer-with-setup-hook'.
+       (dired-dwim-target-directory): Find a window that displays Dired
+       buffer instead of failing when the next window is not Dired.
+       Use `get-window-with-predicate' to find for the next Dired window.
+       (dired-dwim-target-defaults): New function.
+
+       * ediff-util.el (ediff-read-file-name):
+       Use `dired-dwim-target-defaults' to set `minibuffer-default'
+       in `minibuffer-with-setup-hook'.
+
+2009-11-25  Juri Linkov  <address@hidden>
+
        Provide additional default values (file name at point or at the
        current Dired line) via M-n for file reading minibuffers.  (Bug#5010)
 

Index: lisp/dired-aux.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/dired-aux.el,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -b -r1.198 -r1.199
--- lisp/dired-aux.el   19 Nov 2009 07:42:24 -0000      1.198
+++ lisp/dired-aux.el   25 Nov 2009 17:15:24 -0000      1.199
@@ -59,25 +59,22 @@
 With prefix arg, prompt for second argument SWITCHES,
 which is options for `diff'."
   (interactive
-   (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))
+   (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)))))
      (require 'diff)
-     (list (read-file-name (format "Diff %s with%s: "
-                                  current
-                                  (if default
-                                      (concat " (default " default ")")
-                                    ""))
-                          (if default
-                              (dired-current-directory)
-                            (dired-dwim-target-directory))
-                          default t)
+     (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))
           (if current-prefix-arg
               (read-string "Options for diff: "
                            (if (stringp diff-switches)
@@ -128,10 +125,16 @@
     (not (and (= (nth 2 fa1) (nth 2 fa2))   - mark files with different UID
               (= (nth 3 fa1) (nth 3 fa2))))   and GID."
   (interactive
-   (list (read-directory-name (format "Compare %s with: "
+   (list
+    (let* ((target-dir (dired-dwim-target-directory))
+          (defaults (dired-dwim-target-defaults nil target-dir)))
+      (minibuffer-with-setup-hook
+         (lambda ()
+           (set (make-local-variable 'minibuffer-default-add-function) nil)
+           (setq minibuffer-default defaults))
+       (read-directory-name (format "Compare %s with: "
                                      (dired-current-directory))
-                             (dired-dwim-target-directory)
-                             (dired-dwim-target-directory))
+                            target-dir target-dir t)))
          (read-from-minibuffer "Mark if (lisp expr or RET): " nil nil t nil 
"nil")))
   (let* ((dir1 (dired-current-directory))
          (file-alist1 (dired-files-attributes dir1))
@@ -1463,10 +1466,15 @@
         (default (and dired-one-file
                       (expand-file-name (file-name-nondirectory (car fn-list))
                                         target-dir)))
+        (defaults (dired-dwim-target-defaults fn-list target-dir))
         (target (expand-file-name ; fluid variable inside dired-create-files
+                 (minibuffer-with-setup-hook
+                     (lambda ()
+                       (set (make-local-variable 
'minibuffer-default-add-function) nil)
+                       (setq minibuffer-default defaults))
                   (dired-mark-read-file-name
                    (concat (if dired-one-file op1 operation) " %s to: ")
-                   target-dir op-symbol arg rfn-list default)))
+                    target-dir op-symbol arg rfn-list default))))
         (into-dir (cond ((null how-to)
                          ;; Allow DOS/Windows users to change the letter
                          ;; case of a directory.  If we don't test these
@@ -1523,19 +1531,70 @@
 
 (defun dired-dwim-target-directory ()
   ;; Try to guess which target directory the user may want.
-  ;; If there is a dired buffer displayed in the next window, use
-  ;; its current subdir, else use current subdir of this dired buffer.
+  ;; If there is a dired buffer displayed in one of the next windows,
+  ;; use its current subdir, else use current subdir of this dired buffer.
   (let ((this-dir (and (eq major-mode 'dired-mode)
                       (dired-current-directory))))
     ;; non-dired buffer may want to profit from this function, e.g. vm-uudecode
     (if dired-dwim-target
-       (let* ((other-buf (window-buffer (next-window)))
-              (other-dir (with-current-buffer other-buf
+       (let* ((other-win (get-window-with-predicate
+                          (lambda (window)
+                            (with-current-buffer (window-buffer window)
+                              (eq major-mode 'dired-mode)))))
+              (other-dir (and other-win
+                              (with-current-buffer (window-buffer other-win)
                            (and (eq major-mode 'dired-mode)
-                                (dired-current-directory)))))
+                                     (dired-current-directory))))))
          (or other-dir this-dir))
       this-dir)))
 
+(defun dired-dwim-target-defaults (fn-list target-dir)
+  ;; Return a list of default values for file-reading functions in Dired.
+  ;; This list may contain directories from Dired buffers in other windows.
+  ;; `fn-list' is a list of file names used to build a list of defaults.
+  ;; When nil or more than one element, a list of defaults will
+  ;; contain only directory names.  `target-dir' is a directory name
+  ;; to exclude from the returned list, for the case when this
+  ;; directory name is already presented in initial input.
+  ;; For Dired operations that support `dired-dwim-target',
+  ;; the argument `target-dir' should have the value returned
+  ;; from `dired-dwim-target-directory'.
+  (let ((dired-one-file
+        (and (consp fn-list) (null (cdr fn-list)) (car fn-list)))
+       (current-dir (and (eq major-mode 'dired-mode)
+                         (dired-current-directory)))
+       dired-dirs)
+    ;; Get a list of directories of visible buffers in dired-mode.
+    (walk-windows (lambda (w)
+                   (with-current-buffer (window-buffer w)
+                     (and (eq major-mode 'dired-mode)
+                          (push (dired-current-directory) dired-dirs)))))
+    ;; Force the current dir to be the first in the list.
+    (setq dired-dirs
+         (delete-dups (delq nil (cons current-dir (nreverse dired-dirs)))))
+    ;; Remove the target dir (if specified) or the current dir from
+    ;; default values, because it should be already in initial input.
+    (setq dired-dirs (delete (or target-dir current-dir) dired-dirs))
+    ;; Return a list of default values.
+    (if dired-one-file
+       ;; For one file operation, provide a list that contains
+       ;; other directories, other directories with the appended filename
+       ;; and the current directory with the appended filename, e.g.
+       ;; 1. /TARGET-DIR/
+       ;; 2. /TARGET-DIR/FILENAME
+       ;; 3. /CURRENT-DIR/FILENAME
+       (append dired-dirs
+               (mapcar (lambda (dir)
+                         (expand-file-name
+                          (file-name-nondirectory (car fn-list)) dir))
+                       (reverse dired-dirs))
+               (list (expand-file-name
+                      (file-name-nondirectory (car fn-list))
+                      (or target-dir current-dir))))
+      ;; For multi-file operation, return only a list of other directories.
+      dired-dirs)))
+
+
 ;;;###autoload
 (defun dired-create-directory (directory)
   "Create a directory called DIRECTORY."

Index: lisp/ediff-util.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ediff-util.el,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- lisp/ediff-util.el  22 Nov 2009 03:14:15 -0000      1.100
+++ lisp/ediff-util.el  25 Nov 2009 17:15:24 -0000      1.101
@@ -3113,8 +3113,14 @@
   (if (string= default-file "")
       (setq default-file nil))
 
-  (let (f)
-    (setq f (expand-file-name
+  (let ((defaults (and (fboundp 'dired-dwim-target-defaults)
+                      (dired-dwim-target-defaults
+                       (and default-file (list default-file))
+                       default-dir)))
+       f)
+    (setq f (minibuffer-with-setup-hook
+               (lambda () (when defaults
+                            (setq minibuffer-default defaults)))
             (read-file-name
              (format "%s%s "
                      prompt
@@ -3124,10 +3130,8 @@
              default-dir
              (or default-file default-dir)
              t  ; must match, no-confirm
-             (if default-file (file-name-directory default-file))
-             )
-            default-dir
-            ))
+              (if default-file (file-name-directory default-file)))))
+    (setq f (expand-file-name f default-dir))
     ;; If user entered a directory name, expand the default file in that
     ;; directory.  This allows the user to enter a directory name for the
     ;; B-file and diff against the default-file in that directory instead