diff options
| author | Glenn Morris | 2018-09-28 07:54:24 -0700 |
|---|---|---|
| committer | Glenn Morris | 2018-09-28 07:54:24 -0700 |
| commit | 6aa93b45af9fb3631fb8fb6a04407db4d9a74107 (patch) | |
| tree | 9446e698538c3cccc3a7ac40f61e63fa028d68eb /src/keymap.c | |
| parent | 2d54710c36c8b5f7e0d25eefd45c318c0cb533ea (diff) | |
| parent | 1908173a4d79649566fbef12962e251c69e300a2 (diff) | |
| download | emacs-6aa93b45af9fb3631fb8fb6a04407db4d9a74107.tar.gz emacs-6aa93b45af9fb3631fb8fb6a04407db4d9a74107.zip | |
Merge from origin/emacs-26
1908173 (origin/emacs-26) Fix Bug#32828
7f5086d * lisp/net/shr.el (shr-copy-url): Fix docstring.
d309994 Fix typos in documentation
25cdd65 ; Spellcheck two more documentation strings
c8bda05 ; * lisp/simple.el (save-interprogram-paste-before-kill): Fix...
dc7fdee * doc/emacs/kmacro.texi (Basic Keyboard Macro): Mention old b...
17766a1 Improve docs of functions/variables related to 'display-buffer'
a363931 * lisp/mouse.el (tear-off-window): Fix non-mouse use (bug#32799)
8b8a4c0 Improve documentation of directory-local variables
c9c9756 Don't use obsolete variable 'save-place' in documentation
ca208e8 Use save-place-mode instead of save-place
Diffstat (limited to 'src/keymap.c')
| -rw-r--r-- | src/keymap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/keymap.c b/src/keymap.c index 22e24b2cb00..3a79bf4c5aa 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -2298,7 +2298,7 @@ DEFUN ("text-char-description", Ftext_char_description, Stext_char_description, | |||
| 2298 | doc: /* Return the description of CHARACTER in standard Emacs notation. | 2298 | doc: /* Return the description of CHARACTER in standard Emacs notation. |
| 2299 | CHARACTER must be a valid character code that passes the `characterp' test. | 2299 | CHARACTER must be a valid character code that passes the `characterp' test. |
| 2300 | Control characters turn into "^char", and characters with Meta and other | 2300 | Control characters turn into "^char", and characters with Meta and other |
| 2301 | modifiers signal an error, as they are not valid characterr codes. | 2301 | modifiers signal an error, as they are not valid character codes. |
| 2302 | This differs from `single-key-description' which accepts character events, | 2302 | This differs from `single-key-description' which accepts character events, |
| 2303 | and thus doesn't enforce the `characterp' condition, turns control | 2303 | and thus doesn't enforce the `characterp' condition, turns control |
| 2304 | characters into "C-char", and uses the 2**27 bit for Meta. | 2304 | characters into "C-char", and uses the 2**27 bit for Meta. |