aboutsummaryrefslogtreecommitdiffstats
path: root/src/keyboard.c
diff options
context:
space:
mode:
authorPaul Eggert2013-12-07 15:04:10 -0800
committerPaul Eggert2013-12-07 15:04:10 -0800
commit67840e6629754dc1a9196fed4910b58e4e7abd89 (patch)
tree797c405b0afc688355bba15c4a71830f003e3c26 /src/keyboard.c
parent73c8ceea1ab335aae9221a671ae0959704669a52 (diff)
downloademacs-67840e6629754dc1a9196fed4910b58e4e7abd89.tar.gz
emacs-67840e6629754dc1a9196fed4910b58e4e7abd89.zip
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.
Diffstat (limited to 'src/keyboard.c')
-rw-r--r--src/keyboard.c10
1 files changed, 6 insertions, 4 deletions
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;
1954 1954
1955static struct atimer *poll_timer; 1955static struct atimer *poll_timer;
1956 1956
1957/* Poll for input, so that we catch a C-g if it comes in. This 1957#ifdef HAVE_NTGUI
1958 function is called from x_make_frame_visible, see comment 1958/* Poll for input, so that we catch a C-g if it comes in. */
1959 there. */
1960
1961void 1959void
1962poll_for_input_1 (void) 1960poll_for_input_1 (void)
1963{ 1961{
@@ -1965,6 +1963,7 @@ poll_for_input_1 (void)
1965 && !waiting_for_input) 1963 && !waiting_for_input)
1966 gobble_input (); 1964 gobble_input ();
1967} 1965}
1966#endif
1968 1967
1969/* Timer callback function for poll_timer. TIMER is equal to 1968/* Timer callback function for poll_timer. TIMER is equal to
1970 poll_timer. */ 1969 poll_timer. */
@@ -2016,6 +2015,8 @@ start_polling (void)
2016#endif 2015#endif
2017} 2016}
2018 2017
2018#ifdef HAVE_NTGUI
2019
2019/* True if we are using polling to handle input asynchronously. */ 2020/* True if we are using polling to handle input asynchronously. */
2020 2021
2021bool 2022bool
@@ -2030,6 +2031,7 @@ input_polling_used (void)
2030 return 0; 2031 return 0;
2031#endif 2032#endif
2032} 2033}
2034#endif
2033 2035
2034/* Turn off polling. */ 2036/* Turn off polling. */
2035 2037