diff options
| author | Kelly Dean <kelly@prtime.org> | 2015-02-18 07:35:49 +0000 |
|---|---|---|
| committer | Artur Malabarba <bruce.connor.am@gmail.com> | 2015-02-18 16:36:22 -0200 |
| commit | 72f7eded979c672662112304cc8615c0dbcf9803 (patch) | |
| tree | e646fb7cb17c1a8b3769be27e2924e2a33496602 /lisp/simple.el | |
| parent | ad6c1be9230ac8ed517a51778b586055edb952c3 (diff) | |
Use user-error where error is inappropriate
* help-mode.el (help-go-back, help-go-forward, help-follow):
* simple.el (yank-pop, pop-to-mark-command, exchange-point-and-mark):
* winner.el (winner-redo):
* windmove.el (windmove-do-window-select):
* register.el (jump-to-register, increment-register, insert-register)
(append-to-register, prepend-to-register):
* files.el (find-alternate-file, abort-if-file-too-large, write-file)
(set-visited-file-name):
* emacs-lisp/lisp.el (kill-backward-up-list):
Use user-error instead of error. (Bug#14480)
Diffstat (limited to 'lisp/simple.el')
| -rw-r--r-- | lisp/simple.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/simple.el b/lisp/simple.el index 967fbc69cb..b78286dc83 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -4326,7 +4326,7 @@ When this command inserts killed text into the buffer, it honors doc string for `insert-for-yank-1', which see." (interactive "*p") (if (not (eq last-command 'yank)) - (error "Previous command was not a yank")) + (user-error "Previous command was not a yank")) (setq this-command 'yank) (unless arg (setq arg 1)) (let ((inhibit-read-only t) @@ -4958,7 +4958,7 @@ Start discarding off end if gets this big." \(Does not affect global mark ring)." (interactive) (if (null (mark t)) - (error "No mark set in this buffer") + (user-error "No mark set in this buffer") (if (= (point) (mark t)) (message "Mark popped")) (goto-char (mark t)) @@ -5107,7 +5107,7 @@ mode temporarily." (let ((omark (mark t)) (temp-highlight (eq (car-safe transient-mark-mode) 'only))) (if (null omark) - (error "No mark set in this buffer")) + (user-error "No mark set in this buffer")) (set-mark (point)) (goto-char omark) (cond (temp-highlight |