From 76ef09b7c8407733a7e55dd1b14e7807ba83ae5b Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 15 Mar 2011 14:37:03 -0700 Subject: [PATCH] * character.h (PREV_CHAR_BOUNDARY): Rename local to avoid shadowing. --- src/ChangeLog | 3 ++- src/character.h | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 2ebee67dba2..aa03ad660b7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -30,7 +30,8 @@ Remove; unused. * search.c (boyer_moore): Rename locals to avoid shadowing. - * character.h (FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE): Likewise. + * character.h (FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE): + (PREV_CHAR_BOUNDARY): Likewise. * search.c (simple_search): Remove unused var. diff --git a/src/character.h b/src/character.h index ad1577a5c90..f0b0002032e 100644 --- a/src/character.h +++ b/src/character.h @@ -278,11 +278,11 @@ along with GNU Emacs. If not, see . */ do { \ if ((p) > (limit)) \ { \ - const unsigned char *p0 = (p); \ + const unsigned char *pcb = (p); \ do { \ - p0--; \ - } while (p0 >= limit && ! CHAR_HEAD_P (*p0)); \ - (p) = (BYTES_BY_CHAR_HEAD (*p0) == (p) - p0) ? p0 : (p) - 1; \ + pcb--; \ + } while (pcb >= limit && ! CHAR_HEAD_P (*pcb)); \ + (p) = (BYTES_BY_CHAR_HEAD (*pcb) == (p) - pcb) ? pcb : (p) - 1; \ } \ } while (0) -- 2.39.2