diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2013-12-07 15:04:10 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-12-07 15:04:10 -0800 |
| commit | 67840e6629754dc1a9196fed4910b58e4e7abd89 (patch) | |
| tree | 797c405b0afc688355bba15c4a71830f003e3c26 | |
| parent | 73c8ceea1ab335aae9221a671ae0959704669a52 (diff) | |
| download | emacs-67840e6629754dc1a9196fed4910b58e4e7abd89.tar.gz | |
Fix minor problems found by static checking.
* keyboard.c (poll_for_input_1, input_polling_used):
Define only if HAVE_NTGUI.
* xmenu.c (popup_activate_callback): Omit unnecessary
check against USE_X_TOOLKIT, which must be defined here anyway.
* xterm.c, xterm.h (x_dispatch_event) [! (USE_X_TOOLKIT || USE_MOTIF)]:
Now static.
| -rw-r--r-- | src/ChangeLog | 10 | ||||
| -rw-r--r-- | src/keyboard.c | 10 | ||||
| -rw-r--r-- | src/xmenu.c | 2 | ||||
| -rw-r--r-- | src/xterm.c | 3 | ||||
| -rw-r--r-- | src/xterm.h | 2 |
5 files changed, 21 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3072e2dcdec..c7776762b8d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,13 @@ +2013-12-07 Paul Eggert <eggert@cs.ucla.edu> + + Fix minor problems found by static checking. + * keyboard.c (poll_for_input_1, input_polling_used): + Define only if HAVE_NTGUI. + * xmenu.c (popup_activate_callback): Omit unnecessary + check against USE_X_TOOLKIT, which must be defined here anyway. + * xterm.c, xterm.h (x_dispatch_event) [! (USE_X_TOOLKIT || USE_MOTIF)]: + Now static. + 2013-12-07 Martin Rudalics <rudalics@gmx.at> * w32term.c (w32_read_socket): Fix int/Lisp_Object type mixup. diff --git a/src/keyboard.c b/src/keyboard.c index b50c06b4154..913a277ca79 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -1954,10 +1954,8 @@ int poll_suppress_count; static struct atimer *poll_timer; -/* Poll for input, so that we catch a C-g if it comes in. This - function is called from x_make_frame_visible, see comment - there. */ - +#ifdef HAVE_NTGUI +/* Poll for input, so that we catch a C-g if it comes in. */ void poll_for_input_1 (void) { @@ -1965,6 +1963,7 @@ poll_for_input_1 (void) && !waiting_for_input) gobble_input (); } +#endif /* Timer callback function for poll_timer. TIMER is equal to poll_timer. */ @@ -2016,6 +2015,8 @@ start_polling (void) #endif } +#ifdef HAVE_NTGUI + /* True if we are using polling to handle input asynchronously. */ bool @@ -2030,6 +2031,7 @@ input_polling_used (void) return 0; #endif } +#endif /* Turn off polling. */ diff --git a/src/xmenu.c b/src/xmenu.c index d587610fdd7..fb3baa01ef4 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -510,9 +510,7 @@ static void popup_activate_callback (Widget widget, LWLIB_ID id, XtPointer client_data) { popup_activated_flag = 1; -#ifdef USE_X_TOOLKIT x_activate_timeout_atimer (); -#endif } #endif diff --git a/src/xterm.c b/src/xterm.c index e8e69c666ee..90c7c36c44f 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -248,6 +248,9 @@ static void x_sync_with_move (struct frame *, int, int, int); static int handle_one_xevent (struct x_display_info *, const XEvent *, int *, struct input_event *); +#if ! (defined USE_X_TOOLKIT || defined USE_MOTIF) +static int x_dispatch_event (XEvent *, Display *); +#endif /* Don't declare this _Noreturn because we want no interference with debugging failing X calls. */ static void x_connection_closed (Display *, const char *); diff --git a/src/xterm.h b/src/xterm.h index 3d954fb8600..eff75403476 100644 --- a/src/xterm.h +++ b/src/xterm.h @@ -945,7 +945,9 @@ extern void x_clear_area (Display *, Window, int, int, int, int); extern void x_mouse_leave (struct x_display_info *); #endif +#if defined USE_X_TOOLKIT || defined USE_MOTIF extern int x_dispatch_event (XEvent *, Display *); +#endif extern int x_x_to_emacs_modifiers (struct x_display_info *, int); extern int x_display_pixel_height (struct x_display_info *); extern int x_display_pixel_width (struct x_display_info *); |