Mercurial > emacs
changeset 108715:5b835c23f034
* dired-x.el (dired-jump, dired-jump-other-window): Add arg
FILE-NAME to read from the minibuffer when called interactively
with prefix argument instead of using buffer-file-name.
http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00534.html
* dired.el: Update autoloads.
| author | Juri Linkov <juri@jurta.org> |
|---|---|
| date | Fri, 21 May 2010 00:33:58 +0300 |
| parents | 99ad939c8d05 |
| children | bd3afd9376c5 |
| files | etc/NEWS lisp/ChangeLog lisp/dired-x.el lisp/dired.el |
| diffstat | 4 files changed, 35 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/etc/NEWS Thu May 20 11:12:20 2010 -0400 +++ b/etc/NEWS Fri May 21 00:33:58 2010 +0300 @@ -147,6 +147,11 @@ *** The color widget now has a "Choose" button, which allows you to choose a color via list-colors-display. +** Dired-x + +*** dired-jump and dired-jump-other-window called with a prefix argument +read a file name from the minibuffer instead of using buffer-file-name. + ** VC and related modes *** New VC commands: vc-log-incoming, vc-log-outgoing, vc-find-conflicted-file.
--- a/lisp/ChangeLog Thu May 20 11:12:20 2010 -0400 +++ b/lisp/ChangeLog Fri May 21 00:33:58 2010 +0300 @@ -1,3 +1,12 @@ +2010-05-20 Juri Linkov <juri@jurta.org> + + * dired-x.el (dired-jump, dired-jump-other-window): Add arg + FILE-NAME to read from the minibuffer when called interactively + with prefix argument instead of using buffer-file-name. + http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00534.html + + * dired.el: Update autoloads. + 2010-05-20 Chong Yidong <cyd@stupidchicken.com> * nxml/nxml-mode.el (nxml-mode-map): Bind C-c / to
--- a/lisp/dired-x.el Thu May 20 11:12:20 2010 -0400 +++ b/lisp/dired-x.el Fri May 21 00:33:58 2010 +0300 @@ -506,16 +506,21 @@ ;;; JUMP. ;;;###autoload -(defun dired-jump (&optional other-window) +(defun dired-jump (&optional other-window file-name) "Jump to dired buffer corresponding to current buffer. If in a file, dired the current directory and move to file's line. If in Dired already, pop up a level and goto old directory's line. In case the proper dired file line cannot be found, refresh the dired -buffer and try again." - (interactive "P") - (let* ((file buffer-file-name) +buffer and try again. +When OTHER-WINDOW is non-nil, jump to dired buffer in other window. +Interactively with prefix argument, read FILE-NAME and +move to its line in dired." + (interactive + (list nil (and current-prefix-arg + (read-file-name "Jump to dired file: ")))) + (let* ((file (or file-name buffer-file-name)) (dir (if file (file-name-directory file) default-directory))) - (if (eq major-mode 'dired-mode) + (if (and (eq major-mode 'dired-mode) (null file-name)) (progn (setq dir (dired-current-directory)) (dired-up-directory other-window) @@ -539,10 +544,12 @@ (dired-omit-mode) (dired-goto-file file)))))))) -(defun dired-jump-other-window () +(defun dired-jump-other-window (&optional file-name) "Like \\[dired-jump] (`dired-jump') but in other window." - (interactive) - (dired-jump t)) + (interactive + (list (and current-prefix-arg + (read-file-name "Jump to dired file: ")))) + (dired-jump t file-name)) ;;; OMITTING.
--- a/lisp/dired.el Thu May 20 11:12:20 2010 -0400 +++ b/lisp/dired.el Fri May 21 00:33:58 2010 +0300 @@ -3974,7 +3974,7 @@ ;;;*** ;;;### (autoloads (dired-do-relsymlink dired-jump) "dired-x" "dired-x.el" -;;;;;; "2f8d3d5a31b969b181e23c40d6bb16a0") +;;;;;; "6c492aba3ca0d36a4cd7b02fb9c1cc10") ;;; Generated autoloads from dired-x.el (autoload 'dired-jump "dired-x" "\ @@ -3983,8 +3983,11 @@ If in Dired already, pop up a level and goto old directory's line. In case the proper dired file line cannot be found, refresh the dired buffer and try again. - -\(fn &optional OTHER-WINDOW)" t nil) +When OTHER-WINDOW is non-nil, jump to dired buffer in other window. +Interactively with prefix argument, read FILE-NAME and +move to its line in dired. + +\(fn &optional OTHER-WINDOW FILE-NAME)" t nil) (autoload 'dired-do-relsymlink "dired-x" "\ Relative symlink all marked (or next ARG) files into a directory.