diff options
Diffstat (limited to 'src/keymap.c')
| -rw-r--r-- | src/keymap.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/keymap.c b/src/keymap.c index b9d8d18931d..0f50d804dff 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -642,7 +642,7 @@ usage: (map-keymap FUNCTION KEYMAP) */) | |||
| 642 | (Lisp_Object function, Lisp_Object keymap, Lisp_Object sort_first) | 642 | (Lisp_Object function, Lisp_Object keymap, Lisp_Object sort_first) |
| 643 | { | 643 | { |
| 644 | if (! NILP (sort_first)) | 644 | if (! NILP (sort_first)) |
| 645 | return call2 (intern ("map-keymap-sorted"), function, keymap); | 645 | return call2 (Qmap_keymap_sorted, function, keymap); |
| 646 | 646 | ||
| 647 | map_keymap (keymap, map_keymap_call, function, NULL, 1); | 647 | map_keymap (keymap, map_keymap_call, function, NULL, 1); |
| 648 | return Qnil; | 648 | return Qnil; |
| @@ -1334,7 +1334,7 @@ recognize the default bindings, just as `read-key-sequence' does. */) | |||
| 1334 | /* Initialize the unicode case table, if it wasn't already. */ | 1334 | /* Initialize the unicode case table, if it wasn't already. */ |
| 1335 | if (NILP (unicode_case_table)) | 1335 | if (NILP (unicode_case_table)) |
| 1336 | { | 1336 | { |
| 1337 | unicode_case_table = uniprop_table (intern ("lowercase")); | 1337 | unicode_case_table = uniprop_table (Qlowercase); |
| 1338 | /* uni-lowercase.el might be unavailable during bootstrap. */ | 1338 | /* uni-lowercase.el might be unavailable during bootstrap. */ |
| 1339 | if (NILP (unicode_case_table)) | 1339 | if (NILP (unicode_case_table)) |
| 1340 | return found; | 1340 | return found; |
| @@ -3053,7 +3053,7 @@ DESCRIBER is the output function used; nil means use `princ'. */) | |||
| 3053 | { | 3053 | { |
| 3054 | specpdl_ref count = SPECPDL_INDEX (); | 3054 | specpdl_ref count = SPECPDL_INDEX (); |
| 3055 | if (NILP (describer)) | 3055 | if (NILP (describer)) |
| 3056 | describer = intern ("princ"); | 3056 | describer = Qprinc; |
| 3057 | specbind (Qstandard_output, Fcurrent_buffer ()); | 3057 | specbind (Qstandard_output, Fcurrent_buffer ()); |
| 3058 | CHECK_VECTOR_OR_CHAR_TABLE (vector); | 3058 | CHECK_VECTOR_OR_CHAR_TABLE (vector); |
| 3059 | describe_vector (vector, Qnil, describer, describe_vector_princ, 0, | 3059 | describe_vector (vector, Qnil, describer, describe_vector_princ, 0, |
| @@ -3169,7 +3169,7 @@ describe_vector (Lisp_Object vector, Lisp_Object prefix, Lisp_Object args, | |||
| 3169 | Lisp_Object kludge = make_nil_vector (1); | 3169 | Lisp_Object kludge = make_nil_vector (1); |
| 3170 | 3170 | ||
| 3171 | if (partial) | 3171 | if (partial) |
| 3172 | suppress = intern ("suppress-keymap"); | 3172 | suppress = Qsuppress_keymap; |
| 3173 | 3173 | ||
| 3174 | /* STOP is a boundary between normal characters (-#x3FFF7F) and | 3174 | /* STOP is a boundary between normal characters (-#x3FFF7F) and |
| 3175 | 8-bit characters (#x3FFF80-), used below when VECTOR is a | 3175 | 8-bit characters (#x3FFF80-), used below when VECTOR is a |
| @@ -3342,6 +3342,7 @@ syms_of_keymap (void) | |||
| 3342 | { | 3342 | { |
| 3343 | DEFSYM (Qkeymap, "keymap"); | 3343 | DEFSYM (Qkeymap, "keymap"); |
| 3344 | DEFSYM (Qhelp__describe_map_tree, "help--describe-map-tree"); | 3344 | DEFSYM (Qhelp__describe_map_tree, "help--describe-map-tree"); |
| 3345 | DEFSYM (Qmap_keymap_sorted, "map-keymap-sorted"); | ||
| 3345 | 3346 | ||
| 3346 | DEFSYM (Qkeymap_canonicalize, "keymap-canonicalize"); | 3347 | DEFSYM (Qkeymap_canonicalize, "keymap-canonicalize"); |
| 3347 | 3348 | ||
| @@ -3485,6 +3486,7 @@ that describe key bindings. That is why the default is nil. */); | |||
| 3485 | 3486 | ||
| 3486 | DEFSYM (Qkey_parse, "key-parse"); | 3487 | DEFSYM (Qkey_parse, "key-parse"); |
| 3487 | DEFSYM (Qkey_valid_p, "key-valid-p"); | 3488 | DEFSYM (Qkey_valid_p, "key-valid-p"); |
| 3488 | |||
| 3489 | DEFSYM (Qnon_key_event, "non-key-event"); | 3489 | DEFSYM (Qnon_key_event, "non-key-event"); |
| 3490 | DEFSYM (Qprinc, "princ"); | ||
| 3491 | DEFSYM (Qsuppress_keymap, "suppress-keymap"); | ||
| 3490 | } | 3492 | } |