(dired-read-shell-command): Use read-shell-command.

2 files changed, 11 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7518a3a71d3..cac2cd6aa7a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,12 @@
+2008-04-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * dired-aux.el (dired-read-shell-command): Use read-shell-command.
+
 2008-04-07  Sam Steingold  <sds@gnu.org>
 
         * progmodes/inf-lisp.el (lisp-compile-string, lisp-eval-string):
         Add helper functions.
-        (lisp-do-defun): Extracted the common part of lisp-eval-defun and
+        (lisp-do-defun): Extract the common part of lisp-eval-defun and
         lisp-compile-defun; DEFVAR forms reset the variables to the init
         values, just like in emacs-lisp mode eval-defun.
         (lisp-eval-defun, lisp-compile-defun): Use lisp-do-defun.
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index b8c49ff0b1d..49e939fb144 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -514,16 +514,16 @@ with a prefix argument."
                             common-mime-info))))
     commands))
 
+;; This is an extra function so that you can redefine it, e.g., to use gmhist.
 (defun dired-read-shell-command (prompt arg files)
-;;  "Read a dired shell command prompting with PROMPT (using read-string).
-;;ARG is the prefix arg and may be used to indicate in the prompt which
-;;  files are affected.
-;;This is an extra function so that you can redefine it, e.g., to use gmhist."
+  "Read a dired shell command prompting with PROMPT (using read-string).
+ARG is the prefix arg and may be used to indicate in the prompt which
+FILES are affected."
   (dired-mark-pop-up
    nil 'shell files
-   (function read-string)
+   #'read-shell-command
    (format prompt (dired-mark-prompt arg files))
-   nil 'shell-command-history
+   nil nil
    (dired-read-shell-command-default files)))
 
 ;; The in-background argument is only needed in Emacs 18 where