[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 1e4e165: * lisp/simple.el (shell-command): Raise a
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] master 1e4e165: * lisp/simple.el (shell-command): Raise a user-error instead of an error. |
Date: |
Tue, 9 Jul 2019 14:48:44 -0400 (EDT) |
branch: master
commit 1e4e165eaf08329e7e39965334d744189fddde3d
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>
* lisp/simple.el (shell-command): Raise a user-error instead of an error.
---
lisp/simple.el | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lisp/simple.el b/lisp/simple.el
index 983a3b6..2768bd4 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)."
;; If will kill a process, query first.
(if (yes-or-no-p "A command is running in the default
buffer. Kill it? ")
(kill-process proc)
- (error "Shell command in progress")))
+ (user-error "Shell command in progress")))
((eq async-shell-command-buffer 'confirm-new-buffer)
;; If will create a new buffer, query first.
(if (yes-or-no-p "A command is running in the default
buffer. Use a new buffer? ")
(setq buffer (generate-new-buffer bname))
- (error "Shell command in progress")))
+ (user-error "Shell command in progress")))
((eq async-shell-command-buffer 'new-buffer)
;; It will create a new buffer.
(setq buffer (generate-new-buffer bname)))
@@ -3644,7 +3644,7 @@ impose the use of a shell (with its need to quote
arguments)."
(with-current-buffer buffer
(rename-uniquely))
(setq buffer (get-buffer-create bname)))
- (error "Shell command in progress")))
+ (user-error "Shell command in progress")))
((eq async-shell-command-buffer 'rename-buffer)
;; It will rename the buffer.
(with-current-buffer buffer
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 1e4e165: * lisp/simple.el (shell-command): Raise a user-error instead of an error.,
Michael Albinus <=