Commit aa00b92d authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(shell-command, shell-command-on-region):

Fix bugs in previous change.
parent 6f5d1a4f
......@@ -630,9 +630,6 @@ then call `undo-more' one or more times to undo them."
(error "No further undo information"))
(setq pending-undo-list (primitive-undo count pending-undo-list)))
(defvar last-shell-command "")
(defvar last-shell-command-on-region "")
(defvar shell-command-history nil
"History list for some commands that read shell commands.")
......@@ -643,8 +640,9 @@ If COMMAND ends in ampersand, execute it asynchronously.
Optional second arg non-nil (prefix arg, if interactive)
means insert output in current buffer after point (leave mark after it).
This cannot be done asynchronously."
(interactive (list (read-string "Shell command: " last-shell-command)
current-prefix-arg nil nil 'shell-command-history))
(interactive (list (read-from-minibuffer "Shell command: "
nil nil nil 'shell-command-history)
current-prefix-arg))
(if flag
(progn (barf-if-buffer-read-only)
(push-mark)
......@@ -738,9 +736,8 @@ even though that buffer is not automatically displayed. If there is no output
or output is inserted in the current buffer then `*Shell Command Output*' is
deleted."
(interactive (list (region-beginning) (region-end)
(read-string "Shell command on region: "
last-shell-command-on-region
nil nil 'shell-command-history)
(read-from-minibuffer "Shell command on region: "
nil nil nil 'shell-command-history)
current-prefix-arg
(prefix-numeric-value current-prefix-arg)))
(if flag
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment