diff options
| author | Glenn Morris | 2018-02-24 07:50:30 -0800 |
|---|---|---|
| committer | Glenn Morris | 2018-02-24 07:50:30 -0800 |
| commit | 80c2bf6e1684a05b7cdc00f4c4eba89841911c76 (patch) | |
| tree | 317b80c1b824e123480292100c7b2454f0f49779 /src | |
| parent | 8a23dc15077c6bbe3d80ccfcef64397e71f5765d (diff) | |
| parent | 7e7f2ea644388d6d06a4ab6690344f7f7c128141 (diff) | |
| download | emacs-80c2bf6e1684a05b7cdc00f4c4eba89841911c76.tar.gz emacs-80c2bf6e1684a05b7cdc00f4c4eba89841911c76.zip | |
Merge from origin/emacs-26
7e7f2ea (origin/emacs-26) * src/keyboard.c (syms_of_keyboard): Doc fi...
c0676d4 Improve documentation of X resources
d806d69 ; Use @minus for negative numbers in some texi files
4a8ea7d * lisp/international/mule.el (keyboard-coding-system): Doc fix.
8a73b80 Minor doc fixes, mostly for timestamp issues
361a8b9 * doc/emacs/mini.texi (Completion Styles): Improve indexing.
2dc24d5 Fix @findex and @vindex entries in manuals
76f5242 Document, in the Elisp manual, how to get a character's raw s...
5fb2957 Improvements in the Emacs manual
de17b8e Tiny doc/misc markup fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/keyboard.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index 75fbe459b2b..9b8d275d0fd 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -11735,8 +11735,9 @@ immediately after running `post-command-hook'. */); | |||
| 11735 | 11735 | ||
| 11736 | DEFVAR_LISP ("input-method-function", Vinput_method_function, | 11736 | DEFVAR_LISP ("input-method-function", Vinput_method_function, |
| 11737 | doc: /* If non-nil, the function that implements the current input method. | 11737 | doc: /* If non-nil, the function that implements the current input method. |
| 11738 | It's called with one argument, a printing character that was just read. | 11738 | It's called with one argument, which must be a single-byte |
| 11739 | \(That means a character with code 040...0176.) | 11739 | character that was just read. Any single-byte character is |
| 11740 | acceptable, except the DEL character, codepoint 127 decimal, 177 octal. | ||
| 11740 | Typically this function uses `read-event' to read additional events. | 11741 | Typically this function uses `read-event' to read additional events. |
| 11741 | When it does so, it should first bind `input-method-function' to nil | 11742 | When it does so, it should first bind `input-method-function' to nil |
| 11742 | so it will not be called recursively. | 11743 | so it will not be called recursively. |