From e7e4ea210a9fb9a17d3c780161485bf651d30687 Mon Sep 17 00:00:00 2001
From: Juri Linkov <juri@jurta.org>
Date: Wed, 14 Dec 2005 07:52:22 +0000
Subject: [PATCH] (isearch-query-replace): Check for isearch-other-end.

---
 lisp/ChangeLog  | 4 ++++
 lisp/isearch.el | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f1aecc27426..0493ee83f37 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-14  Aaron S. Hawley  <Aaron.Hawley@uvm.edu>
+
+	* isearch.el (isearch-query-replace): Check for isearch-other-end.
+
 2005-12-14  Per Abrahamsen  <abraham@dina.kvl.dk>
 
 	* progmodes/cpp.el (cpp-face): New widget.
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 65fc1f0a394..6361177a345 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1224,7 +1224,8 @@ 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)))))
         (goto-char isearch-other-end))