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

diff --git a/src/ChangeLog b/src/ChangeLog
index 0cd4df78280d506f7a6e683aa48077315ceb772c..c6bb977977453eea3effc8632fce6442e1fe08fe 100644 (file)
--- 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 5879d312b07be76bdcd6f85967695f2c6e616dbd..b4a5354a0a46fc4e7941667ea81e62c085da42ac 100644 (file)
--- 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;
          }