diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2005-12-19 19:57:22 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2005-12-19 19:57:22 +0000 |
| commit | e93b29568add51c918892153759a1fcd440e85be (patch) | |
| tree | 4ca3494b355f5df3d0cdbe155eeaa3f630f293c1 /lisp/isearch.el | |
| parent | 8d3cdf56502e89f00e86b02f24422acfa1b34beb (diff) | |
| parent | 3031d8b0bb97f21c79b3022ff3e7564173facd18 (diff) | |
| download | emacs-e93b29568add51c918892153759a1fcd440e85be.tar.gz | |
Merged from miles@gnu.org--gnu-2005 (patch 169-173, 671-676)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-671
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-672
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-673
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-674
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-675
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-676
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-169
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-170
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-171
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-172
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-173
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-454
Diffstat (limited to 'lisp/isearch.el')
| -rw-r--r-- | lisp/isearch.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/isearch.el b/lisp/isearch.el index 99c637e5664..8f28e13804b 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 |