From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 15 Mar 2011 21:37:03 +0000 (-0700)
Subject: * character.h (PREV_CHAR_BOUNDARY): Rename local to avoid shadowing.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~554^2~56
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=76ef09b7c8407733a7e55dd1b14e7807ba83ae5b;p=emacs.git

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

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 <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)