diff options
author | Paul Eggert <[email protected]> | 2011-09-21 13:22:36 -0700 |
---|---|---|
committer | Paul Eggert <[email protected]> | 2011-09-21 13:22:36 -0700 |
commit | 17f85215fe27b3685df5a97e438c7a185088f29e (patch) | |
tree | 57ba1748153f6372e27e423a787e3d9e90be46d4 /src/syntax.c | |
parent | 0b1fccc479923e2a78dc6398a009d9b8a037080d (diff) |
* syntax.c (scan_words): Revamp to pacify GCC 4.6.1.
Diffstat (limited to 'src/syntax.c')
-rw-r--r-- | src/syntax.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/syntax.c b/src/syntax.c index 2960a9c96a..2556a04498 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -1264,7 +1264,7 @@ scan_words (register ptrdiff_t from, register EMACS_INT count) if (! NILP (Ffboundp (func))) { pos = call2 (func, make_number (from - 1), make_number (end)); - if (RANGED_INTEGERP (from + 1, pos, ZV)) + if (INTEGERP (pos) && from < XINT (pos) && XINT (pos) <= ZV) { from = XINT (pos); from_byte = CHAR_TO_BYTE (from); @@ -1314,7 +1314,7 @@ scan_words (register ptrdiff_t from, register EMACS_INT count) if (! NILP (Ffboundp (func))) { pos = call2 (func, make_number (from), make_number (beg)); - if (RANGED_INTEGERP (BEGV, pos, from - 1)) + if (INTEGERP (pos) && BEGV <= XINT (pos) && XINT (pos) < from) { from = XINT (pos); from_byte = CHAR_TO_BYTE (from); |