* intervals.c (temp_set_point_both): Move test into 'eassert',

for speed.

diff --git a/src/ChangeLog b/src/ChangeLog
index 7800959b0915a500458ecff7653fd82c5a2faa6a..e4456b2ce2bb6059a52244af7a7a5bec58e4721d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2013-10-09  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * intervals.c (temp_set_point_both): Move test into 'eassert',
+       for speed.
+
        * lisp.h (eassert): Don't use 'assume'.
        Sometimes 'assume' wins in performance, and sometimes it loses,
        so it shouldn't be used all the time.  Perhaps we need two

diff --git a/src/intervals.c b/src/intervals.c
index 69a3386728321c8006bac128b19f70beaa73d44e..a9c4f5aed0ba6f38a0605b0bf5b3cffeb16783b0 100644 (file)
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -1792,8 +1792,7 @@ temp_set_point_both (struct buffer *buffer,
                     ptrdiff_t charpos, ptrdiff_t bytepos)
 {
   /* In a single-byte buffer, the two positions must be equal.  */
-  if (BUF_ZV (buffer) == BUF_ZV_BYTE (buffer))
-    eassert (charpos == bytepos);
+  eassert (BUF_ZV (buffer) != BUF_ZV_BYTE (buffer) || charpos == bytepos);
 
   eassert (charpos <= bytepos);
   eassert (charpos <= BUF_ZV (buffer) || BUF_BEGV (buffer) <= charpos);