aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/isearch.el
diff options
context:
space:
mode:
authorKaroly Lorentey <[email protected]>2005-12-19 19:57:22 +0000
committerKaroly Lorentey <[email protected]>2005-12-19 19:57:22 +0000
commite93b29568add51c918892153759a1fcd440e85be (patch)
tree4ca3494b355f5df3d0cdbe155eeaa3f630f293c1 /lisp/isearch.el
parent8d3cdf56502e89f00e86b02f24422acfa1b34beb (diff)
parent3031d8b0bb97f21c79b3022ff3e7564173facd18 (diff)
Merged from [email protected] (patch 169-173, 671-676)
Patches applied: * [email protected]/emacs--cvs-trunk--0--patch-671 Update from CVS * [email protected]/emacs--cvs-trunk--0--patch-672 Update from CVS * [email protected]/emacs--cvs-trunk--0--patch-673 Update from CVS * [email protected]/emacs--cvs-trunk--0--patch-674 Update from CVS * [email protected]/emacs--cvs-trunk--0--patch-675 Update from CVS * [email protected]/emacs--cvs-trunk--0--patch-676 Merge from gnus--rel--5.10 * [email protected]/gnus--rel--5.10--patch-169 Merge from emacs--cvs-trunk--0 * [email protected]/gnus--rel--5.10--patch-170 Update from CVS * [email protected]/gnus--rel--5.10--patch-171 Update from CVS * [email protected]/gnus--rel--5.10--patch-172 Update from CVS * [email protected]/gnus--rel--5.10--patch-173 Update from CVS git-archimport-id: [email protected]/emacs--multi-tty--0--patch-454
Diffstat (limited to 'lisp/isearch.el')
-rw-r--r--lisp/isearch.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 99c637e566..8f28e13804 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1224,9 +1224,10 @@ Use `isearch-exit' to quit without signaling."
(let ((case-fold-search isearch-case-fold-search))
(isearch-done)
(isearch-clean-overlays)
- (if (and (< isearch-other-end (point))
+ (if (and isearch-other-end
+ (< isearch-other-end (point))
(not (and transient-mark-mode mark-active
- (< isearch-opoint (point)))))
+ (< (mark) (point)))))
(goto-char isearch-other-end))
(set query-replace-from-history-variable
(cons isearch-string