diff options
| author | Paul Eggert | 2011-04-01 19:42:05 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-01 19:42:05 -0700 |
| commit | e5a2a5cbf4374b615f841ae421062ec52e492a71 (patch) | |
| tree | 0d4ee286ff48ba4aaa86221523b2c8a9486ba48a /src | |
| parent | a60e5f6862fe24f8f8225eb517f2bfcaffb46923 (diff) | |
| download | emacs-e5a2a5cbf4374b615f841ae421062ec52e492a71.tar.gz emacs-e5a2a5cbf4374b615f841ae421062ec52e492a71.zip | |
* keyboard.c (menu_bar_items, read_char_minibuf_menu_prompt):
Remove vars that are set but not used.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/keyboard.c | 7 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a147bd12cf4..16edc6cbf5d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2011-04-02 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-04-02 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * keyboard.c (menu_bar_items, read_char_minibuf_menu_prompt): | ||
| 4 | Remove vars that are set but not used. | ||
| 5 | |||
| 3 | * gtkutil.c (xg_get_file_with_chooser): Mark var as initialized. | 6 | * gtkutil.c (xg_get_file_with_chooser): Mark var as initialized. |
| 4 | 7 | ||
| 5 | * image.c (lookup_image): Remove var that is set but not used. | 8 | * image.c (lookup_image): Remove var that is set but not used. |
diff --git a/src/keyboard.c b/src/keyboard.c index d307250b868..679d99b0117 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -7357,8 +7357,6 @@ menu_bar_items (Lisp_Object old) | |||
| 7357 | 7357 | ||
| 7358 | Lisp_Object def, tail; | 7358 | Lisp_Object def, tail; |
| 7359 | 7359 | ||
| 7360 | Lisp_Object result; | ||
| 7361 | |||
| 7362 | int mapno; | 7360 | int mapno; |
| 7363 | Lisp_Object oquit; | 7361 | Lisp_Object oquit; |
| 7364 | 7362 | ||
| @@ -7419,8 +7417,6 @@ menu_bar_items (Lisp_Object old) | |||
| 7419 | 7417 | ||
| 7420 | /* Look up in each map the dummy prefix key `menu-bar'. */ | 7418 | /* Look up in each map the dummy prefix key `menu-bar'. */ |
| 7421 | 7419 | ||
| 7422 | result = Qnil; | ||
| 7423 | |||
| 7424 | for (mapno = nmaps - 1; mapno >= 0; mapno--) | 7420 | for (mapno = nmaps - 1; mapno >= 0; mapno--) |
| 7425 | if (!NILP (maps[mapno])) | 7421 | if (!NILP (maps[mapno])) |
| 7426 | { | 7422 | { |
| @@ -8494,7 +8490,6 @@ read_char_minibuf_menu_prompt (int commandflag, int nmaps, Lisp_Object *maps) | |||
| 8494 | int notfirst = 0; | 8490 | int notfirst = 0; |
| 8495 | int i = nlength; | 8491 | int i = nlength; |
| 8496 | Lisp_Object obj; | 8492 | Lisp_Object obj; |
| 8497 | int ch; | ||
| 8498 | Lisp_Object orig_defn_macro; | 8493 | Lisp_Object orig_defn_macro; |
| 8499 | 8494 | ||
| 8500 | /* Loop over elements of map. */ | 8495 | /* Loop over elements of map. */ |
| @@ -8664,8 +8659,6 @@ read_char_minibuf_menu_prompt (int commandflag, int nmaps, Lisp_Object *maps) | |||
| 8664 | return obj; | 8659 | return obj; |
| 8665 | else if (XINT (obj) == -2) | 8660 | else if (XINT (obj) == -2) |
| 8666 | return obj; | 8661 | return obj; |
| 8667 | else | ||
| 8668 | ch = XINT (obj); | ||
| 8669 | 8662 | ||
| 8670 | if (! EQ (obj, menu_prompt_more_char) | 8663 | if (! EQ (obj, menu_prompt_more_char) |
| 8671 | && (!INTEGERP (menu_prompt_more_char) | 8664 | && (!INTEGERP (menu_prompt_more_char) |