(dired-read-dir-and-switches): For C-x d, set the value for M-n to the

visited file name of the current buffer.  Use minibuffer-with-setup-hook
to set minibuffer-default to buffer-file-name inside read-file-name.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 393f7791e2cb541f903a691383b99f93c1c80a5a..2a18864beec52796d065ce1c07bd1ee85062a0b4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
+2007-11-23  Juri Linkov  <juri@jurta.org>
+
+       * dired.el (dired-read-dir-and-switches): For C-x d, set the
+       value for M-n to the visited file name of the current buffer.
+       Use minibuffer-with-setup-hook to set minibuffer-default to
+       buffer-file-name inside read-file-name.
+
+       * man.el (Man-getpage-in-background): Don't disregard user option
+       `Man-width' on non-window systems.  Remove test for `window-system'
+       around setting envvar "COLUMNS" depending on the value of `Man-width'.
+
+       * progmodes/grep.el (grep-process-setup): Set envvar "TERM" to
+       "emacs-grep".  Set envvar "GREP_OPTIONS" to "--color=auto" instead
+       of "--color=always".
+
 2007-11-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * emacs-lisp/lisp.el (beginning-of-defun-raw): Pass `arg' down to

diff --git a/lisp/dired.el b/lisp/dired.el
index 4502609013b7cd4e55134014020ab77060c7e7da..ab56579e718a47bc26f81f7c57fbe27d0e04fa40 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -595,8 +595,12 @@ Don't use that together with FILTER."
            (if (next-read-file-uses-dialog-p)
                (read-directory-name (format "Dired %s(directory): " str)
                                     nil default-directory nil)
-             (read-file-name (format "Dired %s(directory): " str)
-                             nil default-directory nil)))))
+             (let ((default (and buffer-file-name
+                                 (abbreviate-file-name buffer-file-name))))
+               (minibuffer-with-setup-hook
+                   (lambda () (setq minibuffer-default default))
+                 (read-file-name (format "Dired %s(directory): " str)
+                                 nil default-directory nil)))))))
 
 ;;;###autoload (define-key ctl-x-map "d" 'dired)
 ;;;###autoload