(isearch-fallback): Check for `(car previous)'

before calling `isearch-other-end-state'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c4430437d68ef4c7bfb19e630d5925830b40f8de..c7ffabf3e6a58280a4a4e9fc393c9656b92d1c59 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-17  Juri Linkov  <juri@jurta.org>
+
+       * isearch.el (isearch-fallback): Check for `(car previous)'
+       before calling `isearch-other-end-state'.
+
 2005-03-17  Kim F. Storm  <storm@cua.dk>
 
        * simple.el (move-beginning-of-line): Move to beginning of buffer

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