summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorGerd Moellmann <gerd@gnu.org>2001-09-12 13:10:08 +0000
committerGerd Moellmann <gerd@gnu.org>2001-09-12 13:10:08 +0000
commiteaa493dfe68750d0bc7782fd7aae89b5726d2719 (patch)
tree90cc7803029f47dc960beaff171fdeefd3a57882 /lisp
parentfb2c6a6b37999364c3d2cb9507dfbf89d3a390ab (diff)
downloademacs-eaa493dfe68750d0bc7782fd7aae89b5726d2719.tar.gz
(isearch-intersects-p): Fix end checks.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/isearch.el8
2 files changed, 8 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e65b3b82339..f13d80df1ba 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-12 Gerd Moellmann <gerd@gnu.org>
+
+ * isearch.el (isearch-intersects-p): Fix end checks.
+
2001-09-11 Eli Zaretskii <a34785@is.elta.co.il>
* gud.el (dbx) <gud-dbx-use-stopformat-p>: Move this case into the
diff --git a/lisp/isearch.el b/lisp/isearch.el
index a125f7ab053..2c687abee42 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1683,10 +1683,10 @@ If there is no completion possible, say so and continue searching."
(defun isearch-intersects-p (start0 end0 start1 end1)
"Return t if regions START0..END0 and START1..END1 intersect."
- (or (and (>= start0 start1) (< start0 end1))
- (and (>= end0 start1) (< end0 end1))
- (and (>= start1 start0) (< start1 end0))
- (and (>= end1 start0) (< end1 end0))))
+ (or (and (>= start0 start1) (< start0 end1))
+ (and (> end0 start1) (<= end0 end1))
+ (and (>= start1 start0) (< start1 end0))
+ (and (> end1 start0) (<= end1 end0))))
;;; Verify if the current match is outside of each element of