From 17f85215fe27b3685df5a97e438c7a185088f29e Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 21 Sep 2011 13:22:36 -0700 Subject: [PATCH] * syntax.c (scan_words): Revamp to pacify GCC 4.6.1. --- src/syntax.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/syntax.c b/src/syntax.c index 2960a9c96a0..2556a04498e 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); -- 2.39.2