changeset 60672:9b6f40e2868c

(isearch-fallback): Check for `(car previous)' before calling `isearch-other-end-state'.
author Juri Linkov <juri@jurta.org>
date Thu, 17 Mar 2005 19:22:23 +0000
parents e50ee6630db9
children 2a46e603ac58
files lisp/isearch.el
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/isearch.el	Thu Mar 17 19:03:16 2005 +0000
+++ b/lisp/isearch.el	Thu Mar 17 19:22:23 2005 +0000
@@ -1458,8 +1458,10 @@
 	  ;; `stack' now refers the most recent valid regexp that is not at
 	  ;; all optional in its last term.  Now dig one level deeper and find
 	  ;; what matched before that.
-	  (let ((last-other-end (or (isearch-other-end-state (car previous))
-				    isearch-barrier)))
+	  (let ((last-other-end
+		 (or (and (car previous)
+			  (isearch-other-end-state (car previous)))
+		     isearch-barrier)))
 	    (goto-char (if isearch-forward
 			   (max last-other-end isearch-barrier)
 			 (min last-other-end isearch-barrier)))