* lisp/isearch.el (isearch-fail-pos): Check for empty `cmds'.

Fixes: debbugs:14268

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e69fe4b9d0f4a7fd09c9c6e6b86e7b00375150e7..163f249584981f20741897d790368568182e4850 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-27  Darren Hoo  <darren.hoo@gmail.com>  (tiny change)
+
+       * isearch.el (isearch-fail-pos): Check for empty `cmds'.  (Bug#14268)
+
 2013-04-27  Glenn Morris  <rgm@gnu.org>
 
        * vc/log-view.el (log-view-current-entry):

diff --git a/lisp/isearch.el b/lisp/isearch.el
index b36b250738afd072be3e18aa0a63756a9535e21d..b38bfc885f7b6d3c3c308e2b91de6f8a2b537f6a 100644 (file)
--- 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)))))