Mercurial > emacs
comparison src/keymap.c @ 83162:dbcd0af66869
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-409
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-410
Make sure image types are initialized for lookup too
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-411
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-412
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-413
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-414
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-415
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-416
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-417
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-418
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-419
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-202
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Thu, 24 Jun 2004 07:44:13 +0000 |
parents | cf8f0a3b5cb4 dd79816933ec |
children | 09f3fd9f680d |
comparison
equal
deleted
inserted
replaced
83161:8d62eda26760 | 83162:dbcd0af66869 |
---|---|
2281 | 2281 |
2282 /* This function cannot GC. */ | 2282 /* This function cannot GC. */ |
2283 | 2283 |
2284 DEFUN ("text-char-description", Ftext_char_description, Stext_char_description, 1, 1, 0, | 2284 DEFUN ("text-char-description", Ftext_char_description, Stext_char_description, 1, 1, 0, |
2285 doc: /* Return a pretty description of file-character CHARACTER. | 2285 doc: /* Return a pretty description of file-character CHARACTER. |
2286 Control characters turn into "^char", etc. */) | 2286 Control characters turn into "^char", etc. This differs from |
2287 `single-key-description' which turns them into "C-char". | |
2288 Also, this function recognizes the 2**7 bit as the Meta character, | |
2289 whereas `single-key-description' uses the 2**27 bit for Meta. | |
2290 See Info node `(elisp)Describing Characters' for examples. */) | |
2287 (character) | 2291 (character) |
2288 Lisp_Object character; | 2292 Lisp_Object character; |
2289 { | 2293 { |
2290 /* Currently MAX_MULTIBYTE_LENGTH is 4 (< 6). */ | 2294 /* Currently MAX_MULTIBYTE_LENGTH is 4 (< 6). */ |
2291 unsigned char str[6]; | 2295 unsigned char str[6]; |