summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/isearch.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0493ee83f37..0843dab7a13 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-14 Juri Linkov <juri@jurta.org>
+
+ * isearch.el (isearch-query-replace): Use (mark) instead of
+ isearch-opoint if mark is active in transient-mark-mode.
+
2005-12-14 Aaron S. Hawley <Aaron.Hawley@uvm.edu>
* isearch.el (isearch-query-replace): Check for isearch-other-end.
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 6361177a345..846d749f2f0 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1227,7 +1227,7 @@ Use `isearch-exit' to quit without signaling."
(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