# HG changeset patch # User Juri Linkov # Date 1111087343 0 # Node ID 9b6f40e2868c3b8ab7fc5224ac76f80196310f59 # Parent e50ee6630db9b3e2af53fc8db933fc06d55bd5cb (isearch-fallback): Check for `(car previous)' before calling `isearch-other-end-state'. diff -r e50ee6630db9 -r 9b6f40e2868c lisp/isearch.el --- 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)))