diff options
| author | Paul Eggert | 2011-06-12 22:49:35 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-06-12 22:49:35 -0700 |
| commit | 6da655361cb06353fd844e968a450d4e4b15f569 (patch) | |
| tree | ed6b24f233d8c30487d886c34129f30163d868bb /src | |
| parent | 7147c4a44b3fdcc9bab92e8a57a150bc73d42939 (diff) | |
| download | emacs-6da655361cb06353fd844e968a450d4e4b15f569.tar.gz emacs-6da655361cb06353fd844e968a450d4e4b15f569.zip | |
* xterm.c (handle_one_xevent): Omit unnecessary casts to unsigned.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/xterm.c | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f8482b26d18..8e74e4a630e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2011-06-13 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-06-13 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * xterm.c (handle_one_xevent): Omit unnecessary casts to unsigned. | ||
| 4 | |||
| 3 | * keyboard.c (modify_event_symbol): Don't limit alist len to UINT_MAX. | 5 | * keyboard.c (modify_event_symbol): Don't limit alist len to UINT_MAX. |
| 4 | 6 | ||
| 5 | * lisp.h (CHAR_TABLE_SET): Omit now-redundant test. | 7 | * 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, | |||
| 6438 | keys". It seems there's no cleaner way. | 6438 | keys". It seems there's no cleaner way. |
| 6439 | Test IsModifierKey to avoid handling | 6439 | Test IsModifierKey to avoid handling |
| 6440 | mode_switch incorrectly. */ | 6440 | mode_switch incorrectly. */ |
| 6441 | || ((unsigned) (keysym) >= XK_Select | 6441 | || (XK_Select <= keysym && keysym < XK_KP_Space) |
| 6442 | && (unsigned)(keysym) < XK_KP_Space) | ||
| 6443 | #endif | 6442 | #endif |
| 6444 | #ifdef XK_dead_circumflex | 6443 | #ifdef XK_dead_circumflex |
| 6445 | || orig_keysym == XK_dead_circumflex | 6444 | || orig_keysym == XK_dead_circumflex |
| @@ -6492,10 +6491,8 @@ handle_one_xevent (struct x_display_info *dpyinfo, XEvent *eventptr, | |||
| 6492 | should be treated similarly to | 6491 | should be treated similarly to |
| 6493 | Mode_switch by Emacs. */ | 6492 | Mode_switch by Emacs. */ |
| 6494 | #if defined XK_ISO_Lock && defined XK_ISO_Last_Group_Lock | 6493 | #if defined XK_ISO_Lock && defined XK_ISO_Last_Group_Lock |
| 6495 | || ((unsigned)(orig_keysym) | 6494 | || (XK_ISO_Lock <= orig_keysym |
| 6496 | >= XK_ISO_Lock | 6495 | && orig_keysym <= XK_ISO_Last_Group_Lock) |
| 6497 | && (unsigned)(orig_keysym) | ||
| 6498 | <= XK_ISO_Last_Group_Lock) | ||
| 6499 | #endif | 6496 | #endif |
| 6500 | )) | 6497 | )) |
| 6501 | { | 6498 | { |