summaryrefslogtreecommitdiff
path: root/lisp/isearch.el
diff options
context:
space:
mode:
authorJuri Linkov <juri@jurta.org>2005-03-17 19:22:55 +0000
committerJuri Linkov <juri@jurta.org>2005-03-17 19:22:55 +0000
commit5a1f9fcfea78b08c75e31af2d8f05c15a3b41622 (patch)
treec79e067f13e0ed79819fc35a1c489567d7d5d024 /lisp/isearch.el
parent3c916d6555803a089eb3fc75223a0a90a21f9b84 (diff)
downloademacs-5a1f9fcfea78b08c75e31af2d8f05c15a3b41622.tar.gz
(isearch-fallback): Check for `(car previous)'
before calling `isearch-other-end-state'.
Diffstat (limited to 'lisp/isearch.el')
-rw-r--r--lisp/isearch.el6
1 files changed, 4 insertions, 2 deletions
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)))