diff options
| author | Paul Eggert | 2013-07-16 07:52:22 -0700 |
|---|---|---|
| committer | Paul Eggert | 2013-07-16 07:52:22 -0700 |
| commit | c43843aa1ad80cc0e4f6dc2ab523727b10b10a22 (patch) | |
| tree | f2c7d9027092692bb8e919ece4ae5cccdff5f96f /src | |
| parent | 77aea2fbb3fc290a59d84e6534424a09aa8fc41a (diff) | |
| download | emacs-c43843aa1ad80cc0e4f6dc2ab523727b10b10a22.tar.gz emacs-c43843aa1ad80cc0e4f6dc2ab523727b10b10a22.zip | |
Fix minor problems found by --enable-gcc-warnings.
* frame.c (Fhandle_focus_in, Fhandle_focus_out): Return a value.
* keyboard.c (kbd_buffer_get_event): Remove unused local.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/frame.c | 4 | ||||
| -rw-r--r-- | src/keyboard.c | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 7c3548c4f84..3f597ec63b1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2013-07-16 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | Fix minor problems found by --enable-gcc-warnings. | ||
| 4 | * frame.c (Fhandle_focus_in, Fhandle_focus_out): Return a value. | ||
| 5 | * keyboard.c (kbd_buffer_get_event): Remove unused local. | ||
| 6 | |||
| 1 | 2013-07-16 Jan Djärv <jan.h.d@swipnet.se> | 7 | 2013-07-16 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 8 | ||
| 3 | * xterm.c (x_focus_changed): Always generate FOCUS_IN_EVENT. | 9 | * xterm.c (x_focus_changed): Always generate FOCUS_IN_EVENT. |
diff --git a/src/frame.c b/src/frame.c index 5bd9f777755..5fa54052cd2 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -895,7 +895,7 @@ is not generated. | |||
| 895 | This function checks if blink-cursor timers should be turned on again. */) | 895 | This function checks if blink-cursor timers should be turned on again. */) |
| 896 | (Lisp_Object event) | 896 | (Lisp_Object event) |
| 897 | { | 897 | { |
| 898 | call0 (intern ("blink-cursor-check")); | 898 | return call0 (intern ("blink-cursor-check")); |
| 899 | } | 899 | } |
| 900 | 900 | ||
| 901 | DEFUN ("handle-focus-out", Fhandle_focus_out, Shandle_focus_out, 1, 1, "e", | 901 | DEFUN ("handle-focus-out", Fhandle_focus_out, Shandle_focus_out, 1, 1, "e", |
| @@ -905,7 +905,7 @@ Focus out events occur when no frame has focus. | |||
| 905 | This function checks if blink-cursor timers should be turned off. */) | 905 | This function checks if blink-cursor timers should be turned off. */) |
| 906 | (Lisp_Object event) | 906 | (Lisp_Object event) |
| 907 | { | 907 | { |
| 908 | call0 (intern ("blink-cursor-suspend")); | 908 | return call0 (intern ("blink-cursor-suspend")); |
| 909 | } | 909 | } |
| 910 | 910 | ||
| 911 | DEFUN ("handle-switch-frame", Fhandle_switch_frame, Shandle_switch_frame, 1, 1, "e", | 911 | DEFUN ("handle-switch-frame", Fhandle_switch_frame, Shandle_switch_frame, 1, 1, "e", |
diff --git a/src/keyboard.c b/src/keyboard.c index 5cdb87818ca..e852fb65cdd 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -4092,7 +4092,7 @@ kbd_buffer_get_event (KBOARD **kbp, | |||
| 4092 | #else | 4092 | #else |
| 4093 | struct x_display_info *di; | 4093 | struct x_display_info *di; |
| 4094 | #endif | 4094 | #endif |
| 4095 | Lisp_Object rest, frame = event->frame_or_window; | 4095 | Lisp_Object frame = event->frame_or_window; |
| 4096 | bool focused = false; | 4096 | bool focused = false; |
| 4097 | 4097 | ||
| 4098 | for (di = x_display_list; di && ! focused; di = di->next) | 4098 | for (di = x_display_list; di && ! focused; di = di->next) |