diff options
| author | Paul Eggert | 2011-03-08 23:07:42 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-03-08 23:07:42 -0800 |
| commit | 2b07bcffb0e2b6cef517406cbc979ac14e46cd8e (patch) | |
| tree | 88df81d75f81d84fd89010ea71cb8de5e6e753da | |
| parent | 7411c6867f74428cf2441cb2b1bd5100185b9a03 (diff) | |
| download | emacs-2b07bcffb0e2b6cef517406cbc979ac14e46cd8e.tar.gz emacs-2b07bcffb0e2b6cef517406cbc979ac14e46cd8e.zip | |
* xterm.c: Don't declare local "event" unless it's used.
| -rw-r--r-- | src/ChangeLog | 1 | ||||
| -rw-r--r-- | src/xterm.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f0c1db2ab73..7f9e68e71e5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | (x_shift_glyphs_for_insert, XTflash, XTring_bell): | 7 | (x_shift_glyphs_for_insert, XTflash, XTring_bell): |
| 8 | (x_calc_absolute_position): Now static. | 8 | (x_calc_absolute_position): Now static. |
| 9 | (XTread_socket): Don't define label "out" unless it's used. | 9 | (XTread_socket): Don't define label "out" unless it's used. |
| 10 | Don't declare local "event" unless it's used. | ||
| 10 | 11 | ||
| 11 | * xfaces.c (clear_face_cache, Fx_list_fonts, Fface_font): Rename | 12 | * xfaces.c (clear_face_cache, Fx_list_fonts, Fface_font): Rename |
| 12 | or move locals to avoid shadowing. | 13 | or move locals to avoid shadowing. |
diff --git a/src/xterm.c b/src/xterm.c index 4c7fc1b9b1e..f253ed0aa3f 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -6991,7 +6991,6 @@ static int | |||
| 6991 | XTread_socket (struct terminal *terminal, int expected, struct input_event *hold_quit) | 6991 | XTread_socket (struct terminal *terminal, int expected, struct input_event *hold_quit) |
| 6992 | { | 6992 | { |
| 6993 | int count = 0; | 6993 | int count = 0; |
| 6994 | XEvent event; | ||
| 6995 | int event_found = 0; | 6994 | int event_found = 0; |
| 6996 | 6995 | ||
| 6997 | if (interrupt_input_blocked) | 6996 | if (interrupt_input_blocked) |
| @@ -7025,6 +7024,7 @@ XTread_socket (struct terminal *terminal, int expected, struct input_event *hold | |||
| 7025 | while (XPending (terminal->display_info.x->display)) | 7024 | while (XPending (terminal->display_info.x->display)) |
| 7026 | { | 7025 | { |
| 7027 | int finish; | 7026 | int finish; |
| 7027 | XEvent event; | ||
| 7028 | 7028 | ||
| 7029 | XNextEvent (terminal->display_info.x->display, &event); | 7029 | XNextEvent (terminal->display_info.x->display, &event); |
| 7030 | 7030 | ||