aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/simple.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/simple.el b/lisp/simple.el
index 983a3b6973d..2768bd4a75e 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3628,12 +3628,12 @@ impose the use of a shell (with its need to quote arguments)."
3628 ;; If will kill a process, query first. 3628 ;; If will kill a process, query first.
3629 (if (yes-or-no-p "A command is running in the default buffer. Kill it? ") 3629 (if (yes-or-no-p "A command is running in the default buffer. Kill it? ")
3630 (kill-process proc) 3630 (kill-process proc)
3631 (error "Shell command in progress"))) 3631 (user-error "Shell command in progress")))
3632 ((eq async-shell-command-buffer 'confirm-new-buffer) 3632 ((eq async-shell-command-buffer 'confirm-new-buffer)
3633 ;; If will create a new buffer, query first. 3633 ;; If will create a new buffer, query first.
3634 (if (yes-or-no-p "A command is running in the default buffer. Use a new buffer? ") 3634 (if (yes-or-no-p "A command is running in the default buffer. Use a new buffer? ")
3635 (setq buffer (generate-new-buffer bname)) 3635 (setq buffer (generate-new-buffer bname))
3636 (error "Shell command in progress"))) 3636 (user-error "Shell command in progress")))
3637 ((eq async-shell-command-buffer 'new-buffer) 3637 ((eq async-shell-command-buffer 'new-buffer)
3638 ;; It will create a new buffer. 3638 ;; It will create a new buffer.
3639 (setq buffer (generate-new-buffer bname))) 3639 (setq buffer (generate-new-buffer bname)))
@@ -3644,7 +3644,7 @@ impose the use of a shell (with its need to quote arguments)."
3644 (with-current-buffer buffer 3644 (with-current-buffer buffer
3645 (rename-uniquely)) 3645 (rename-uniquely))
3646 (setq buffer (get-buffer-create bname))) 3646 (setq buffer (get-buffer-create bname)))
3647 (error "Shell command in progress"))) 3647 (user-error "Shell command in progress")))
3648 ((eq async-shell-command-buffer 'rename-buffer) 3648 ((eq async-shell-command-buffer 'rename-buffer)
3649 ;; It will rename the buffer. 3649 ;; It will rename the buffer.
3650 (with-current-buffer buffer 3650 (with-current-buffer buffer