aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-03-14 08:19:28 -0700
committerPaul Eggert2011-03-14 08:19:28 -0700
commit560a553af5dacb11317afda073344fdbe17fdf17 (patch)
treedd7723ef171872a4b034cb357bd69700ea9f94e4 /src
parent69a058fab1a6396629f783e70b36bd3a7825c54e (diff)
downloademacs-560a553af5dacb11317afda073344fdbe17fdf17.tar.gz
emacs-560a553af5dacb11317afda073344fdbe17fdf17.zip
* keyboard.c (read_key_sequence): Mark locals as initialized.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog1
-rw-r--r--src/keyboard.c7
2 files changed, 5 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 896f3ea4be0..c4b4b4b5494 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -8,6 +8,7 @@
8 (decode_keyboard_code, tty_read_avail_input, menu_bar_items): 8 (decode_keyboard_code, tty_read_avail_input, menu_bar_items):
9 (parse_tool_bar_item, read_key_sequence, Fread_key_sequence): 9 (parse_tool_bar_item, read_key_sequence, Fread_key_sequence):
10 (Fread_key_sequence_vector): Rename locals to avoid shadowing. 10 (Fread_key_sequence_vector): Rename locals to avoid shadowing.
11 (read_key_sequence): Mark locals as initialized.
11 12
12 * keyboard.h (make_ctrl_char): New decl. 13 * keyboard.h (make_ctrl_char): New decl.
13 (mark_kboards): Move decl here ... 14 (mark_kboards): Move decl here ...
diff --git a/src/keyboard.c b/src/keyboard.c
index a3083be2aee..5680f32502c 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -8866,7 +8866,7 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
8866 8866
8867 /* The length of the echo buffer when we started reading, and 8867 /* The length of the echo buffer when we started reading, and
8868 the length of this_command_keys when we started reading. */ 8868 the length of this_command_keys when we started reading. */
8869 int echo_start; 8869 int echo_start IF_LINT (= 0);
8870 int keys_start; 8870 int keys_start;
8871 8871
8872 /* The number of keymaps we're scanning right now, and the number of 8872 /* The number of keymaps we're scanning right now, and the number of
@@ -8944,7 +8944,7 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
8944 Lisp_Object first_event; 8944 Lisp_Object first_event;
8945#endif 8945#endif
8946 8946
8947 Lisp_Object original_uppercase; 8947 Lisp_Object original_uppercase IF_LINT (= Qnil);
8948 int original_uppercase_position = -1; 8948 int original_uppercase_position = -1;
8949 8949
8950 /* Gets around Microsoft compiler limitations. */ 8950 /* Gets around Microsoft compiler limitations. */
@@ -9123,7 +9123,8 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
9123 while those allow us to restart the entire key sequence, 9123 while those allow us to restart the entire key sequence,
9124 echo_local_start and keys_local_start allow us to throw away 9124 echo_local_start and keys_local_start allow us to throw away
9125 just one key. */ 9125 just one key. */
9126 int echo_local_start, keys_local_start, local_first_binding; 9126 int echo_local_start IF_LINT (= 0);
9127 int keys_local_start, local_first_binding;
9127 9128
9128 eassert (indec.end == t || (indec.end > t && indec.end <= mock_input)); 9129 eassert (indec.end == t || (indec.end > t && indec.end <= mock_input));
9129 eassert (indec.start <= indec.end); 9130 eassert (indec.start <= indec.end);