diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-09-20 07:50:34 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-09-20 07:50:34 -0700 |
| commit | 44c1ce3a370ed94199751d1429a65f40880b9234 (patch) | |
| tree | c797f1b9a2aa388b2bfdd9ebe7b2a7555088d5ae /src/keymap.c | |
| parent | 229c51afbf741b20504b821e6fd5da4145a776f5 (diff) | |
| parent | d28d54c76754759e5f0fc8254541fbb4ef6a21d8 (diff) | |
| download | emacs-44c1ce3a370ed94199751d1429a65f40880b9234.tar.gz | |
Merge from origin/emacs-26
d28d54c (origin/emacs-26) More accurate docs for 'text-char-description'
b3baf99 Document synchronous behavior of eshell/make (Bug#32513)
98544ea Fix bs-show with wide characters (Bug#17822)
85af51b Improve Custom menu labels for 2 options
72a2a36 Improve wording of last change in dired-x.texi
d4fa83b Fix GnuTLS test suite with GnuTLS versions 3.4.x
b5bee6b Fix build with gnutls versions 3.0 to 3.2 (Bug#32446)
67eb80e ; * etc/enriched.txt (hanging-indents): Remove extra indent.
c71cfb7 Fix the Bubbles game on TTY frames
3bbf21b Add choice to reshow certificate information (Bug#31877)
6f2c471 * src/alloc.c (Fbool_vector, Flist, Fvector): Doc tweak.
39eecb3 * src/alloc.c (vector): Fix grammatical error in doc string: ...
Diffstat (limited to 'src/keymap.c')
| -rw-r--r-- | src/keymap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/keymap.c b/src/keymap.c index e405ed8c827..22e24b2cb00 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -2297,7 +2297,8 @@ push_text_char_description (register unsigned int c, register char *p) DEFUN ("text-char-description", Ftext_char_description, Stext_char_description, 1, 1, 0, doc: /* Return the description of CHARACTER in standard Emacs notation. CHARACTER must be a valid character code that passes the `characterp' test. -Control characters turn into "^char", the 2**7 bit is treated as Meta, etc. +Control characters turn into "^char", and characters with Meta and other +modifiers signal an error, as they are not valid characterr codes. This differs from `single-key-description' which accepts character events, and thus doesn't enforce the `characterp' condition, turns control characters into "C-char", and uses the 2**27 bit for Meta. |