From: Paul Eggert Date: Mon, 13 Jun 2011 05:49:35 +0000 (-0700) Subject: * xterm.c (handle_one_xevent): Omit unnecessary casts to unsigned. X-Git-Tag: emacs-pretest-24.0.90~104^2~548^2~27 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6da655361cb06353fd844e968a450d4e4b15f569;p=emacs.git * xterm.c (handle_one_xevent): Omit unnecessary casts to unsigned. --- diff --git a/src/ChangeLog b/src/ChangeLog index f8482b26d18..8e74e4a630e 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 d6d6457f522..39e4abb1630 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 )) {