summaryrefslogtreecommitdiff
path: root/lisp/windmove.el
diff options
context:
space:
mode:
authorKelly Dean <kelly@prtime.org>2015-02-18 07:35:49 +0000
committerArtur Malabarba <bruce.connor.am@gmail.com>2015-02-18 16:36:22 -0200
commit72f7eded979c672662112304cc8615c0dbcf9803 (patch)
treee646fb7cb17c1a8b3769be27e2924e2a33496602 /lisp/windmove.el
parentad6c1be9230ac8ed517a51778b586055edb952c3 (diff)
downloademacs-72f7eded979c672662112304cc8615c0dbcf9803.tar.gz
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/windmove.el')
-rw-r--r--lisp/windmove.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/windmove.el b/lisp/windmove.el
index d857dfc98dd..c461a00740a 100644
--- a/lisp/windmove.el
+++ b/lisp/windmove.el
@@ -479,10 +479,10 @@ DIR, ARG, and WINDOW are handled as by `windmove-other-window-loc'.
If no window is at direction DIR, an error is signaled."
(let ((other-window (windmove-find-other-window dir arg window)))
(cond ((null other-window)
- (error "No window %s from selected window" dir))
+ (user-error "No window %s from selected window" dir))
((and (window-minibuffer-p other-window)
(not (minibuffer-window-active-p other-window)))
- (error "Minibuffer is inactive"))
+ (user-error "Minibuffer is inactive"))
(t
(select-window other-window)))))