* character.h (PREV_CHAR_BOUNDARY): Rename local to avoid shadowing.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2ebee67dba2071a7f37dbfd4fc53b219bc6768a7..aa03ad660b7b417204b532bdc8a38858443e86cc 100644 (file)
--- 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 ad1577a5c907fa330347cbbca896883e556645b4..f0b0002032e063cc35db645b824b991e897c62ca 100644 (file)
--- a/src/character.h
+++ b/src/character.h
@@ -278,11 +278,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
   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)