summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-04-04 00:55:46 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2011-04-04 00:55:46 -0700
commitfdfc4bf34ecc9d0d7ee2241e246191a5f928a33a (patch)
tree09afa009a54d1b46c7c062a50e0e2337db24b7d4 /src
parent12cbf13fe46123b574a1dff5ac246e3e7d514623 (diff)
* bytecode.c (exec_byte_code): Rename local to avoid shadowing.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/bytecode.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 0cd4df7828..c6bb977977 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 5879d312b0..b4a5354a0a 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;
}