[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r115412: Fix minor problems found by static checking
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] trunk r115412: Fix minor problems found by static checking. |
Date: |
Sat, 07 Dec 2013 23:04:21 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 115412
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sat 2013-12-07 15:04:10 -0800
message:
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.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/keyboard.c keyboard.c-20091113204419-o5vbwnq5f7feedwu-449
src/xmenu.c xmenu.c-20091113204419-o5vbwnq5f7feedwu-161
src/xterm.c xterm.c-20091113204419-o5vbwnq5f7feedwu-244
src/xterm.h xterm.h-20091113204419-o5vbwnq5f7feedwu-228
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-12-07 17:48:52 +0000
+++ b/src/ChangeLog 2013-12-07 23:04:10 +0000
@@ -1,3 +1,13 @@
+2013-12-07 Paul Eggert <address@hidden>
+
+ 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 <address@hidden>
* w32term.c (w32_read_socket): Fix int/Lisp_Object type mixup.
=== modified file 'src/keyboard.c'
--- a/src/keyboard.c 2013-11-30 09:25:31 +0000
+++ b/src/keyboard.c 2013-12-07 23:04:10 +0000
@@ -1954,10 +1954,8 @@
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 @@
&& !waiting_for_input)
gobble_input ();
}
+#endif
/* Timer callback function for poll_timer. TIMER is equal to
poll_timer. */
@@ -2016,6 +2015,8 @@
#endif
}
+#ifdef HAVE_NTGUI
+
/* True if we are using polling to handle input asynchronously. */
bool
@@ -2030,6 +2031,7 @@
return 0;
#endif
}
+#endif
/* Turn off polling. */
=== modified file 'src/xmenu.c'
--- a/src/xmenu.c 2013-11-30 09:25:31 +0000
+++ b/src/xmenu.c 2013-12-07 23:04:10 +0000
@@ -510,9 +510,7 @@
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
=== modified file 'src/xterm.c'
--- a/src/xterm.c 2013-12-06 05:49:05 +0000
+++ b/src/xterm.c 2013-12-07 23:04:10 +0000
@@ -248,6 +248,9 @@
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 *);
=== modified file 'src/xterm.h'
--- a/src/xterm.h 2013-12-06 05:49:05 +0000
+++ b/src/xterm.h 2013-12-07 23:04:10 +0000
@@ -945,7 +945,9 @@
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 *);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r115412: Fix minor problems found by static checking.,
Paul Eggert <=