diff options
| author | Juri Linkov | 2009-02-22 21:52:14 +0000 |
|---|---|---|
| committer | Juri Linkov | 2009-02-22 21:52:14 +0000 |
| commit | 57199d9b746b4c65fc4b72c47f0fa1266bb8f9e5 (patch) | |
| tree | 0d173598ad54a531f21f8a786da8297cf947bf9b | |
| parent | a61bc6e204e6a228a3fb435976b161465776a92b (diff) | |
| download | emacs-57199d9b746b4c65fc4b72c47f0fa1266bb8f9e5.tar.gz emacs-57199d9b746b4c65fc4b72c47f0fa1266bb8f9e5.zip | |
(dired-smart-shell-command): Remove code that uses
minibuffer-with-setup-hook to set minibuffer-default-add-function
to minibuffer-default-add-shell-commands because the same code was
already moved to `read-shell-command' 2008-07-31.
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/dired-x.el | 12 |
2 files changed, 11 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 44ddc6a3485..7f25c0064d8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2009-02-22 Juri Linkov <juri@jurta.org> | ||
| 2 | |||
| 3 | * dired-x.el (dired-smart-shell-command): Remove code that uses | ||
| 4 | minibuffer-with-setup-hook to set minibuffer-default-add-function | ||
| 5 | to minibuffer-default-add-shell-commands because the same code was | ||
| 6 | already moved to `read-shell-command' 2008-07-31. | ||
| 7 | |||
| 1 | 2009-02-21 Jay Belanger <jay.p.belanger@gmail.com> | 8 | 2009-02-21 Jay Belanger <jay.p.belanger@gmail.com> |
| 2 | 9 | ||
| 3 | * calc/calc-math.el (math-use-emacs-fn): Make sure that the | 10 | * calc/calc-math.el (math-use-emacs-fn): Make sure that the |
diff --git a/lisp/dired-x.el b/lisp/dired-x.el index 0dd36800916..9570ecda71f 100644 --- a/lisp/dired-x.el +++ b/lisp/dired-x.el | |||
| @@ -843,14 +843,10 @@ Knows about the special cases in variable `default-directory-alist'." | |||
| 843 | "Like function `shell-command', but in the current Virtual Dired directory." | 843 | "Like function `shell-command', but in the current Virtual Dired directory." |
| 844 | (interactive | 844 | (interactive |
| 845 | (list | 845 | (list |
| 846 | (minibuffer-with-setup-hook | 846 | (read-shell-command "Shell command: " nil nil |
| 847 | (lambda () | 847 | (cond |
| 848 | (set (make-local-variable 'minibuffer-default-add-function) | 848 | (buffer-file-name (file-relative-name buffer-file-name)) |
| 849 | 'minibuffer-default-add-shell-commands)) | 849 | ((eq major-mode 'dired-mode) (dired-get-filename t t)))) |
| 850 | (read-shell-command "Shell command: " nil nil | ||
| 851 | (cond | ||
| 852 | (buffer-file-name (file-relative-name buffer-file-name)) | ||
| 853 | ((eq major-mode 'dired-mode) (dired-get-filename t t))))) | ||
| 854 | current-prefix-arg | 850 | current-prefix-arg |
| 855 | shell-command-default-error-buffer)) | 851 | shell-command-default-error-buffer)) |
| 856 | (let ((default-directory (dired-default-directory))) | 852 | (let ((default-directory (dired-default-directory))) |