diff options
| author | Miles Bader | 2004-06-29 16:46:06 +0000 |
|---|---|---|
| committer | Miles Bader | 2004-06-29 16:46:06 +0000 |
| commit | 12483a9413619e286efc673a2b277d85cebf3b0c (patch) | |
| tree | d489e0fa758c0d51d792d42140cbeafa4aede31b /src/keymap.c | |
| parent | c786a8ae1c5e84d0f0903d516dd0fc190dc1193c (diff) | |
| parent | 619b6adbd2b96accbbf18051bf69149a029557ee (diff) | |
| download | emacs-12483a9413619e286efc673a2b277d85cebf3b0c.tar.gz emacs-12483a9413619e286efc673a2b277d85cebf3b0c.zip | |
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-17
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-417
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-419
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-420
Tweak permissions
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-421
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-430
Update from CVS
Diffstat (limited to 'src/keymap.c')
| -rw-r--r-- | src/keymap.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/keymap.c b/src/keymap.c index fbf1263a71b..4c23977ef41 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -2273,7 +2273,11 @@ push_text_char_description (c, p) | |||
| 2273 | 2273 | ||
| 2274 | DEFUN ("text-char-description", Ftext_char_description, Stext_char_description, 1, 1, 0, | 2274 | DEFUN ("text-char-description", Ftext_char_description, Stext_char_description, 1, 1, 0, |
| 2275 | doc: /* Return a pretty description of file-character CHARACTER. | 2275 | doc: /* Return a pretty description of file-character CHARACTER. |
| 2276 | Control characters turn into "^char", etc. */) | 2276 | Control characters turn into "^char", etc. This differs from |
| 2277 | `single-key-description' which turns them into "C-char". | ||
| 2278 | Also, this function recognizes the 2**7 bit as the Meta character, | ||
| 2279 | whereas `single-key-description' uses the 2**27 bit for Meta. | ||
| 2280 | See Info node `(elisp)Describing Characters' for examples. */) | ||
| 2277 | (character) | 2281 | (character) |
| 2278 | Lisp_Object character; | 2282 | Lisp_Object character; |
| 2279 | { | 2283 | { |