aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2007-11-23 00:33:48 +0000
committerJuri Linkov2007-11-23 00:33:48 +0000
commitb3acb094ec7180eb596a51e22efe72d98cec1d46 (patch)
treef7f4f841fa849c667a477fd69066929017736c28
parent8783fe91be449416e1aab353afed54ff965c236f (diff)
downloademacs-b3acb094ec7180eb596a51e22efe72d98cec1d46.tar.gz
emacs-b3acb094ec7180eb596a51e22efe72d98cec1d46.zip
(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.
-rw-r--r--lisp/ChangeLog15
-rw-r--r--lisp/dired.el8
2 files changed, 21 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 393f7791e2c..2a18864beec 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
12007-11-23 Juri Linkov <juri@jurta.org>
2
3 * dired.el (dired-read-dir-and-switches): For C-x d, set the
4 value for M-n to the visited file name of the current buffer.
5 Use minibuffer-with-setup-hook to set minibuffer-default to
6 buffer-file-name inside read-file-name.
7
8 * man.el (Man-getpage-in-background): Don't disregard user option
9 `Man-width' on non-window systems. Remove test for `window-system'
10 around setting envvar "COLUMNS" depending on the value of `Man-width'.
11
12 * progmodes/grep.el (grep-process-setup): Set envvar "TERM" to
13 "emacs-grep". Set envvar "GREP_OPTIONS" to "--color=auto" instead
14 of "--color=always".
15
12007-11-22 Stefan Monnier <monnier@iro.umontreal.ca> 162007-11-22 Stefan Monnier <monnier@iro.umontreal.ca>
2 17
3 * emacs-lisp/lisp.el (beginning-of-defun-raw): Pass `arg' down to 18 * emacs-lisp/lisp.el (beginning-of-defun-raw): Pass `arg' down to
diff --git a/lisp/dired.el b/lisp/dired.el
index 4502609013b..ab56579e718 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -595,8 +595,12 @@ Don't use that together with FILTER."
595 (if (next-read-file-uses-dialog-p) 595 (if (next-read-file-uses-dialog-p)
596 (read-directory-name (format "Dired %s(directory): " str) 596 (read-directory-name (format "Dired %s(directory): " str)
597 nil default-directory nil) 597 nil default-directory nil)
598 (read-file-name (format "Dired %s(directory): " str) 598 (let ((default (and buffer-file-name
599 nil default-directory nil))))) 599 (abbreviate-file-name buffer-file-name))))
600 (minibuffer-with-setup-hook
601 (lambda () (setq minibuffer-default default))
602 (read-file-name (format "Dired %s(directory): " str)
603 nil default-directory nil)))))))
600 604
601;;;###autoload (define-key ctl-x-map "d" 'dired) 605;;;###autoload (define-key ctl-x-map "d" 'dired)
602;;;###autoload 606;;;###autoload