From 1be4d76143bb2d969e7c78f7af4c8d711e888205 Mon Sep 17 00:00:00 2001
From: Paul Eggert
Date: Fri, 1 Apr 2011 00:18:17 -0700
Subject: * bytecode.c (Fbyte_code) [!defined BYTE_CODE_SAFE]: Remove var

that is set but not used.
---
 src/bytecode.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/bytecode.c')

diff --git a/src/bytecode.c b/src/bytecode.c
index a7be8e26f27..5a62c913a40 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -425,8 +425,8 @@ If the third argument is incorrect, Emacs may crash.  */)
 #ifdef BYTE_CODE_SAFE
   int const_length = XVECTOR (vector)->size;
   Lisp_Object *stacke;
-#endif
   int bytestr_length;
+#endif
   struct byte_stack stack;
   Lisp_Object *top;
   Lisp_Object result;
@@ -453,7 +453,9 @@ If the third argument is incorrect, Emacs may crash.  */)
        convert them back to the originally intended unibyte form.  */
     bytestr = Fstring_as_unibyte (bytestr);
 
+#ifdef BYTE_CODE_SAFE
   bytestr_length = SBYTES (bytestr);
+#endif
   vectorp = XVECTOR (vector)->contents;
 
   stack.byte_string = bytestr;
-- 
cgit v1.2.1


From fdfc4bf34ecc9d0d7ee2241e246191a5f928a33a Mon Sep 17 00:00:00 2001
From: Paul Eggert
Date: Mon, 4 Apr 2011 00:55:46 -0700
Subject: * bytecode.c (exec_byte_code): Rename local to avoid shadowing.

---
 src/bytecode.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/bytecode.c')

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;
 	  }
-- 
cgit v1.2.1