[Emacs-diffs] Changes to emacs/lisp/simple.el,v

[Juri Linkov]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juri Linkov <jurta>     08/07/31 16:51:21

Index: simple.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/simple.el,v
retrieving revision 1.940
retrieving revision 1.941
diff -u -b -r1.940 -r1.941
--- simple.el   30 Jul 2008 16:38:29 -0000      1.940
+++ simple.el   31 Jul 2008 16:51:21 -0000      1.941
@@ -2012,11 +2012,15 @@
 The arguments are the same as the ones of `read-from-minibuffer',
 except READ and KEYMAP are missing and HIST defaults
 to `shell-command-history'."
+  (minibuffer-with-setup-hook
+      (lambda ()
+       (set (make-local-variable 'minibuffer-default-add-function)
+            'minibuffer-default-add-shell-commands))
   (apply 'read-from-minibuffer prompt initial-contents
          minibuffer-local-shell-command-map
          nil
          (or hist 'shell-command-history)
-         args))
+          args)))
 
 (defun shell-command (command &optional output-buffer error-buffer)
   "Execute string COMMAND in inferior shell; display output, if any.
@@ -2070,13 +2074,9 @@
 
   (interactive
    (list
-    (minibuffer-with-setup-hook
-       (lambda ()
-         (set (make-local-variable 'minibuffer-default-add-function)
-              'minibuffer-default-add-shell-commands))
       (read-shell-command "Shell command: " nil nil
                          (and buffer-file-name
-                              (file-relative-name buffer-file-name))))
+                            (file-relative-name buffer-file-name)))
     current-prefix-arg
     shell-command-default-error-buffer))
   ;; Look for a handler in case default-directory is a remote file name.