summaryrefslogtreecommitdiff
path: root/lisp/isearch.el
diff options
context:
space:
mode:
authorDarren Hoo <darren.hoo@gmail.com>2013-04-28 01:03:42 +0300
committerJuri Linkov <juri@jurta.org>2013-04-28 01:03:42 +0300
commit3ffa2d4f29440a26680c9ceb9cc81ca18e5f3029 (patch)
treefa47a5c5dded84151462beb3f9f4b475e9c5cf41 /lisp/isearch.el
parent201dbb588d3dba1c7deb9bf8d493a5d34b09622a (diff)
downloademacs-3ffa2d4f29440a26680c9ceb9cc81ca18e5f3029.tar.gz
* lisp/isearch.el (isearch-fail-pos): Check for empty `cmds'.
Fixes: debbugs:14268
Diffstat (limited to 'lisp/isearch.el')
-rw-r--r--lisp/isearch.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/isearch.el b/lisp/isearch.el
index b36b250738a..b38bfc885f7 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1106,8 +1106,9 @@ If MSG is non-nil, use variable `isearch-message', otherwise `isearch-string'."
(curr-msg (if msg isearch-message isearch-string))
succ-msg)
(when (or (not isearch-success) isearch-error)
- (while (or (not (isearch--state-success (car cmds)))
- (isearch--state-error (car cmds)))
+ (while (and cmds
+ (or (not (isearch--state-success (car cmds)))
+ (isearch--state-error (car cmds))))
(pop cmds))
(setq succ-msg (and cmds (if msg (isearch--state-message (car cmds))
(isearch--state-string (car cmds)))))