aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2008-03-20 19:56:58 +0000
committerStefan Monnier2008-03-20 19:56:58 +0000
commit286d4b3b7da0dbaf579923bf1b6e295b661de2e9 (patch)
treeeb03f2f322c70af33075ed4ed67d92ee8f533c95
parent7c6d20657f5c6928a80c1603d46e9450e1c962e6 (diff)
downloademacs-286d4b3b7da0dbaf579923bf1b6e295b661de2e9.tar.gz
emacs-286d4b3b7da0dbaf579923bf1b6e295b661de2e9.zip
* progmodes/compile.el (compile):
* progmodes/grep.el (grep, grep-find): Use read-shell-command.
-rw-r--r--lisp/ChangeLog9
-rw-r--r--lisp/progmodes/compile.el9
-rw-r--r--lisp/progmodes/grep.el14
3 files changed, 19 insertions, 13 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b2809bf0090..fa1ce50aaa7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
12008-03-20 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * progmodes/compile.el (compile):
4 * progmodes/grep.el (grep, grep-find): Use read-shell-command.
5
6 * simple.el (minibuffer-local-shell-command-map): New var.
7 (minibuffer-complete-shell-command, read-shell-command): New funs.
8 (shell-command, shell-command-on-region): Use them.
9
12008-03-20 Dan Nicolaescu <dann@ics.uci.edu> 102008-03-20 Dan Nicolaescu <dann@ics.uci.edu>
2 11
3 * vc.el (vc-status-mark-buffer-changed): New function to implement 12 * vc.el (vc-status-mark-buffer-changed): New function to implement
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 86db755b234..be69da1d7f6 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1031,11 +1031,10 @@ to a function that generates a unique name."
1031 (list 1031 (list
1032 (let ((command (eval compile-command))) 1032 (let ((command (eval compile-command)))
1033 (if (or compilation-read-command current-prefix-arg) 1033 (if (or compilation-read-command current-prefix-arg)
1034 (read-from-minibuffer "Compile command: " 1034 (read-shell-command "Compile command: " command
1035 command nil nil 1035 (if (equal (car compile-history) command)
1036 (if (equal (car compile-history) command) 1036 '(compile-history . 1)
1037 '(compile-history . 1) 1037 'compile-history))
1038 'compile-history))
1039 command)) 1038 command))
1040 (consp current-prefix-arg))) 1039 (consp current-prefix-arg)))
1041 (unless (equal command (eval compile-command)) 1040 (unless (equal command (eval compile-command))
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index e1bce497224..6cd5c657aef 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -644,11 +644,10 @@ list is empty)."
644 (progn 644 (progn
645 (grep-compute-defaults) 645 (grep-compute-defaults)
646 (let ((default (grep-default-command))) 646 (let ((default (grep-default-command)))
647 (list (read-from-minibuffer "Run grep (like this): " 647 (list (read-shell-command "Run grep (like this): "
648 (if current-prefix-arg 648 (if current-prefix-arg default grep-command)
649 default grep-command) 649 'grep-history
650 nil nil 'grep-history 650 (if current-prefix-arg nil default))))))
651 (if current-prefix-arg nil default))))))
652 651
653 ;; Setting process-setup-function makes exit-message-function work 652 ;; Setting process-setup-function makes exit-message-function work
654 ;; even when async processes aren't supported. 653 ;; even when async processes aren't supported.
@@ -671,9 +670,8 @@ easily repeat a find command."
671 (progn 670 (progn
672 (grep-compute-defaults) 671 (grep-compute-defaults)
673 (if grep-find-command 672 (if grep-find-command
674 (list (read-from-minibuffer "Run find (like this): " 673 (list (read-shell-command "Run find (like this): "
675 grep-find-command nil nil 674 grep-find-command 'grep-find-history))
676 'grep-find-history))
677 ;; No default was set 675 ;; No default was set
678 (read-string 676 (read-string
679 "compile.el: No `grep-find-command' command available. Press RET.") 677 "compile.el: No `grep-find-command' command available. Press RET.")