diff options
| author | Dmitry Antipov | 2013-03-07 07:01:17 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2013-03-07 07:01:17 +0400 |
| commit | 3de717bdb483f7c6e23cd7701ee4ebd77eccb8b9 (patch) | |
| tree | 28cb71a881d9a3801c36dd7de6be5f0d2bcaf776 /src/keyboard.c | |
| parent | ab89e9f9a594c30ce4c04e6d502bee3beaefe908 (diff) | |
| download | emacs-3de717bdb483f7c6e23cd7701ee4ebd77eccb8b9.tar.gz emacs-3de717bdb483f7c6e23cd7701ee4ebd77eccb8b9.zip | |
* lisp.h (list2i, list3i): New functions.
(list4i): Move from window.c and make LISP_INLINE.
* editfns.c (make_lisp_time):
* fns.c (Flocale_info):
* keyboard.c (parse_modifiers):
* xterm.c (x_ewmh_activate_frame): Use list2i.
* instel.c (signal_after_change):
* nsfns.m (Fx_server_version, Fxw_color_values):
* w32fns.c (Fxw_color_values, Fx_server_version):
* xfns.c (Fxw_color_values, Fx_server_version): Use list3i.
* fileio.c (Fvisited_file_modtime):
* nsfns.m (Fns_display_usable_bounds):
* w32.c (ltime): Use list4i.
Diffstat (limited to 'src/keyboard.c')
| -rw-r--r-- | src/keyboard.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index 9cb9dd0b47b..914378947ed 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -6225,9 +6225,7 @@ parse_modifiers (Lisp_Object symbol) | |||
| 6225 | Lisp_Object elements; | 6225 | Lisp_Object elements; |
| 6226 | 6226 | ||
| 6227 | if (INTEGERP (symbol)) | 6227 | if (INTEGERP (symbol)) |
| 6228 | return (Fcons (make_number (KEY_TO_CHAR (symbol)), | 6228 | return list2i (KEY_TO_CHAR (symbol), XINT (symbol) & CHAR_MODIFIER_MASK); |
| 6229 | Fcons (make_number (XINT (symbol) & CHAR_MODIFIER_MASK), | ||
| 6230 | Qnil))); | ||
| 6231 | else if (!SYMBOLP (symbol)) | 6229 | else if (!SYMBOLP (symbol)) |
| 6232 | return Qnil; | 6230 | return Qnil; |
| 6233 | 6231 | ||