diff options
Diffstat (limited to 'src/keymap.c')
| -rw-r--r-- | src/keymap.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/keymap.c b/src/keymap.c index 79dce15a812..e405ed8c827 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -2216,10 +2216,12 @@ push_key_description (EMACS_INT ch, char *p) | |||
| 2216 | 2216 | ||
| 2217 | DEFUN ("single-key-description", Fsingle_key_description, | 2217 | DEFUN ("single-key-description", Fsingle_key_description, |
| 2218 | Ssingle_key_description, 1, 2, 0, | 2218 | Ssingle_key_description, 1, 2, 0, |
| 2219 | doc: /* Return a pretty description of command character KEY. | 2219 | doc: /* Return a pretty description of a character event KEY. |
| 2220 | Control characters turn into C-whatever, etc. | 2220 | Control characters turn into C-whatever, etc. |
| 2221 | Optional argument NO-ANGLES non-nil means don't put angle brackets | 2221 | Optional argument NO-ANGLES non-nil means don't put angle brackets |
| 2222 | around function keys and event symbols. */) | 2222 | around function keys and event symbols. |
| 2223 | |||
| 2224 | See `text-char-description' for describing character codes. */) | ||
| 2223 | (Lisp_Object key, Lisp_Object no_angles) | 2225 | (Lisp_Object key, Lisp_Object no_angles) |
| 2224 | { | 2226 | { |
| 2225 | USE_SAFE_ALLOCA; | 2227 | USE_SAFE_ALLOCA; |
| @@ -2293,11 +2295,12 @@ push_text_char_description (register unsigned int c, register char *p) | |||
| 2293 | /* This function cannot GC. */ | 2295 | /* This function cannot GC. */ |
| 2294 | 2296 | ||
| 2295 | DEFUN ("text-char-description", Ftext_char_description, Stext_char_description, 1, 1, 0, | 2297 | DEFUN ("text-char-description", Ftext_char_description, Stext_char_description, 1, 1, 0, |
| 2296 | doc: /* Return a pretty description of file-character CHARACTER. | 2298 | doc: /* Return the description of CHARACTER in standard Emacs notation. |
| 2297 | Control characters turn into "^char", etc. This differs from | 2299 | CHARACTER must be a valid character code that passes the `characterp' test. |
| 2298 | `single-key-description' which turns them into "C-char". | 2300 | Control characters turn into "^char", the 2**7 bit is treated as Meta, etc. |
| 2299 | Also, this function recognizes the 2**7 bit as the Meta character, | 2301 | This differs from `single-key-description' which accepts character events, |
| 2300 | whereas `single-key-description' uses the 2**27 bit for Meta. | 2302 | and thus doesn't enforce the `characterp' condition, turns control |
| 2303 | characters into "C-char", and uses the 2**27 bit for Meta. | ||
| 2301 | See Info node `(elisp)Describing Characters' for examples. */) | 2304 | See Info node `(elisp)Describing Characters' for examples. */) |
| 2302 | (Lisp_Object character) | 2305 | (Lisp_Object character) |
| 2303 | { | 2306 | { |