(isearch-query-replace): Use (mark) instead of

isearch-opoint if mark is active in transient-mark-mode.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0493ee83f37ecb8258d5c66fff47677b1ce1e998..0843dab7a139489a324339d40c1c11f03a5fb55c 100644 (file)
--- 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 6361177a345b62aa0c6a7d54c1f67e92cc051c90..846d749f2f0a3ded63660e6bdcda111a16e1f755 100644 (file)
--- 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