merge from trunk

2 files changed, 10 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4b862f27a02..d53f1414917 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2013-09-16  Dmitry Antipov  <dmantipov@yandex.ru>
 
+        * xterm.c (toolkit_scroll_bar_interaction): Use bool for boolean.
+        (ignore_next_mouse_click_timeout): Use Time as X does.
+        (handle_one_xevent): Avoid cast and use unsigned comparison.
+
+2013-09-16  Dmitry Antipov  <dmantipov@yandex.ru>
+
         Do not copy X event in handle_one_xevent except KeyPress case.
         Wnen XEvent is processed, it is unlikely to be changed except
         KeyPress case, so we can avoid copying and use const pointer to
diff --git a/src/xterm.c b/src/xterm.c
index c548443157d..6322ed0840d 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -163,20 +163,21 @@ Lisp_Object x_display_name_list;
 static struct frame *pending_autoraise_frame;
 
 #ifdef USE_X_TOOLKIT
+
 /* The application context for Xt use.  */
 XtAppContext Xt_app_con;
 static String Xt_default_resources[] = {0};
 
 /* Non-zero means user is interacting with a toolkit scroll bar.  */
+static bool toolkit_scroll_bar_interaction;
 
-static int toolkit_scroll_bar_interaction;
 #endif /* USE_X_TOOLKIT */
 
 /* Non-zero timeout value means ignore next mouse click if it arrives
    before that timeout elapses (i.e. as part of the same sequence of
    events resulting from clicking on a frame to select it).  */
 
-static unsigned long ignore_next_mouse_click_timeout;
+static Time ignore_next_mouse_click_timeout;
 
 /* Mouse movement.
 
@@ -6902,7 +6903,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
                   if (ignore_next_mouse_click_timeout)
                     {
                       if (event->type == ButtonPress
-                          && (int)(event->xbutton.time - ignore_next_mouse_click_timeout) > 0)
+                          && event->xbutton.time > ignore_next_mouse_click_timeout)
                         {
                           ignore_next_mouse_click_timeout = 0;
                           construct_mouse_click (&inev.ie, &event->xbutton, f);