* keyboard.c (menu_bar_items, read_char_minibuf_menu_prompt):

Remove vars that are set but not used.

diff --git a/src/ChangeLog b/src/ChangeLog
index a147bd12cf44109520e822475d04a13875e7ac2e..16edc6cbf5d31ad6f9924e491c79c501676b2c40 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2011-04-02  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * keyboard.c (menu_bar_items, read_char_minibuf_menu_prompt):
+       Remove vars that are set but not used.
+
        * gtkutil.c (xg_get_file_with_chooser): Mark var as initialized.
 
        * image.c (lookup_image): Remove var that is set but not used.

diff --git a/src/keyboard.c b/src/keyboard.c
index d307250b8683b4f3fa4ffb1102ff28cdffff1fdf..679d99b0117158d406abfac5b1ed783d40052464 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -7357,8 +7357,6 @@ menu_bar_items (Lisp_Object old)
 
   Lisp_Object def, tail;
 
-  Lisp_Object result;
-
   int mapno;
   Lisp_Object oquit;
 
@@ -7419,8 +7417,6 @@ menu_bar_items (Lisp_Object old)
 
   /* Look up in each map the dummy prefix key `menu-bar'.  */
 
-  result = Qnil;
-
   for (mapno = nmaps - 1; mapno >= 0; mapno--)
     if (!NILP (maps[mapno]))
       {
@@ -8494,7 +8490,6 @@ read_char_minibuf_menu_prompt (int commandflag, int nmaps, Lisp_Object *maps)
       int notfirst = 0;
       int i = nlength;
       Lisp_Object obj;
-      int ch;
       Lisp_Object orig_defn_macro;
 
       /* Loop over elements of map.  */
@@ -8664,8 +8659,6 @@ read_char_minibuf_menu_prompt (int commandflag, int nmaps, Lisp_Object *maps)
        return obj;
       else if (XINT (obj) == -2)
         return obj;
-      else
-       ch = XINT (obj);
 
       if (! EQ (obj, menu_prompt_more_char)
          && (!INTEGERP (menu_prompt_more_char)