From 5a1f9fcfea78b08c75e31af2d8f05c15a3b41622 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Thu, 17 Mar 2005 19:22:55 +0000 Subject: [PATCH] (isearch-fallback): Check for `(car previous)' before calling `isearch-other-end-state'. --- lisp/ChangeLog | 5 +++++ lisp/isearch.el | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c4430437d68..c7ffabf3e6a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2005-03-17 Juri Linkov + + * isearch.el (isearch-fallback): Check for `(car previous)' + before calling `isearch-other-end-state'. + 2005-03-17 Kim F. Storm * simple.el (move-beginning-of-line): Move to beginning of buffer diff --git a/lisp/isearch.el b/lisp/isearch.el index 68247b96980..f44b20b3eda 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -1458,8 +1458,10 @@ barrier." ;; `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))) -- 2.39.2