From 6da655361cb06353fd844e968a450d4e4b15f569 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 12 Jun 2011 22:49:35 -0700 Subject: [PATCH] * xterm.c (handle_one_xevent): Omit unnecessary casts to unsigned. --- src/ChangeLog | 2 ++ src/xterm.c | 9 +++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index f8482b26d1..8e74e4a630 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2011-06-13 Paul Eggert + * xterm.c (handle_one_xevent): Omit unnecessary casts to unsigned. + * keyboard.c (modify_event_symbol): Don't limit alist len to UINT_MAX. * lisp.h (CHAR_TABLE_SET): Omit now-redundant test. diff --git a/src/xterm.c b/src/xterm.c index d6d6457f52..39e4abb163 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -6438,8 +6438,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, XEvent *eventptr, keys". It seems there's no cleaner way. Test IsModifierKey to avoid handling mode_switch incorrectly. */ - || ((unsigned) (keysym) >= XK_Select - && (unsigned)(keysym) < XK_KP_Space) + || (XK_Select <= keysym && keysym < XK_KP_Space) #endif #ifdef XK_dead_circumflex || orig_keysym == XK_dead_circumflex @@ -6492,10 +6491,8 @@ handle_one_xevent (struct x_display_info *dpyinfo, XEvent *eventptr, should be treated similarly to Mode_switch by Emacs. */ #if defined XK_ISO_Lock && defined XK_ISO_Last_Group_Lock - || ((unsigned)(orig_keysym) - >= XK_ISO_Lock - && (unsigned)(orig_keysym) - <= XK_ISO_Last_Group_Lock) + || (XK_ISO_Lock <= orig_keysym + && orig_keysym <= XK_ISO_Last_Group_Lock) #endif )) { -- 2.20.1