diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2013-10-09 10:56:58 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-10-09 10:56:58 -0700 |
| commit | ab7ce9783297397bba2daaf76f93e6a1186883d0 (patch) | |
| tree | f48bdf827656a8bf795de00a72c906eec741a195 /src | |
| parent | 0d5d30295a43e14a63369f637233b30b48cd98ba (diff) | |
| download | emacs-ab7ce9783297397bba2daaf76f93e6a1186883d0.tar.gz emacs-ab7ce9783297397bba2daaf76f93e6a1186883d0.tar.bz2 emacs-ab7ce9783297397bba2daaf76f93e6a1186883d0.zip | |
* intervals.c (temp_set_point_both): Move test into 'eassert',
for speed.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/intervals.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 7800959b091..e4456b2ce2b 100644 --- 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 69a33867283..a9c4f5aed0b 100644 --- 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); |