aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2011-04-04 00:55:46 -0700
committerPaul Eggert2011-04-04 00:55:46 -0700
commitfdfc4bf34ecc9d0d7ee2241e246191a5f928a33a (patch)
tree09afa009a54d1b46c7c062a50e0e2337db24b7d4
parent12cbf13fe46123b574a1dff5ac246e3e7d514623 (diff)
downloademacs-fdfc4bf34ecc9d0d7ee2241e246191a5f928a33a.tar.gz
emacs-fdfc4bf34ecc9d0d7ee2241e246191a5f928a33a.zip
* bytecode.c (exec_byte_code): Rename local to avoid shadowing.
-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 0cd4df78280..c6bb9779774 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12011-04-04 Paul Eggert <eggert@cs.ucla.edu> 12011-04-04 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * bytecode.c (exec_byte_code): Rename local to avoid shadowing.
4
3 * syntax.c (scan_words): Remove var that was set but not used. 5 * syntax.c (scan_words): Remove var that was set but not used.
4 (update_syntax_table): Use unsigned instead of int. 6 (update_syntax_table): Use unsigned instead of int.
5 7
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,
938 938
939 case Bsave_window_excursion: /* Obsolete since 24.1. */ 939 case Bsave_window_excursion: /* Obsolete since 24.1. */
940 { 940 {
941 register int count = SPECPDL_INDEX (); 941 register int count1 = SPECPDL_INDEX ();
942 record_unwind_protect (Fset_window_configuration, 942 record_unwind_protect (Fset_window_configuration,
943 Fcurrent_window_configuration (Qnil)); 943 Fcurrent_window_configuration (Qnil));
944 BEFORE_POTENTIAL_GC (); 944 BEFORE_POTENTIAL_GC ();
945 TOP = Fprogn (TOP); 945 TOP = Fprogn (TOP);
946 unbind_to (count, TOP); 946 unbind_to (count1, TOP);
947 AFTER_POTENTIAL_GC (); 947 AFTER_POTENTIAL_GC ();
948 break; 948 break;
949 } 949 }