From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 4 Apr 2011 07:55:46 +0000 (-0700)
Subject: * bytecode.c (exec_byte_code): Rename local to avoid shadowing.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~394^2~31
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fdfc4bf34ecc9d0d7ee2241e246191a5f928a33a;p=emacs.git

* bytecode.c (exec_byte_code): Rename local to avoid shadowing.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 0cd4df78280..c6bb9779774 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-04-04  Paul Eggert  <eggert@cs.ucla.edu>
 
+	* bytecode.c (exec_byte_code): Rename local to avoid shadowing.
+
 	* syntax.c (scan_words): Remove var that was set but not used.
 	(update_syntax_table): Use unsigned instead of int.
 
diff --git a/src/bytecode.c b/src/bytecode.c
index 5879d312b07..b4a5354a0a4 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -938,12 +938,12 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
 
 	case Bsave_window_excursion: /* Obsolete since 24.1.  */
 	  {
-	    register int count = SPECPDL_INDEX ();
+	    register int count1 = SPECPDL_INDEX ();
 	    record_unwind_protect (Fset_window_configuration,
 				   Fcurrent_window_configuration (Qnil));
 	    BEFORE_POTENTIAL_GC ();
 	    TOP = Fprogn (TOP);
-	    unbind_to (count, TOP);
+	    unbind_to (count1, TOP);
 	    AFTER_POTENTIAL_GC ();
 	    break;
 	  }