aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2006-08-21 02:09:31 +0000
committerKenichi Handa2006-08-21 02:09:31 +0000
commit748726f4d0afd75e639ab15ecef1c8ac62bf93f6 (patch)
treeebf162c031acc8bf3709aa4480f6246ee2ca80e6 /src
parent15fe08255793a44b9631184ce5cd88908abf1e33 (diff)
downloademacs-748726f4d0afd75e639ab15ecef1c8ac62bf93f6.tar.gz
emacs-748726f4d0afd75e639ab15ecef1c8ac62bf93f6.zip
(syms_of_keyboard): Docstring of
Vunread_post_input_method_events and Vunread_input_method_events fixed.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/keyboard.c8
2 files changed, 11 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index b7778885c13..8308a1ab29d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12006-08-21 Kenichi Handa <handa@m17n.org>
2
3 * keyboard.c (syms_of_keyboard): Docstring of
4 Vunread_post_input_method_events and Vunread_input_method_events
5 fixed.
6
12006-08-20 Chong Yidong <cyd@stupidchicken.com> 72006-08-20 Chong Yidong <cyd@stupidchicken.com>
2 8
3 * keyboard.c (show_help_echo): Preserve mouse movement flag if 9 * keyboard.c (show_help_echo): Preserve mouse movement flag if
diff --git a/src/keyboard.c b/src/keyboard.c
index e4c17d5d43f..72e6844d841 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -11228,14 +11228,16 @@ These events are processed first, before actual keyboard input. */);
11228 11228
11229 DEFVAR_LISP ("unread-post-input-method-events", &Vunread_post_input_method_events, 11229 DEFVAR_LISP ("unread-post-input-method-events", &Vunread_post_input_method_events,
11230 doc: /* List of events to be processed as input by input methods. 11230 doc: /* List of events to be processed as input by input methods.
11231These events are processed after `unread-command-events', but 11231These events are processed before `unread-command-events'
11232before actual keyboard input. */); 11232and actual keyboard input without given to `input-method-function'. */);
11233 Vunread_post_input_method_events = Qnil; 11233 Vunread_post_input_method_events = Qnil;
11234 11234
11235 DEFVAR_LISP ("unread-input-method-events", &Vunread_input_method_events, 11235 DEFVAR_LISP ("unread-input-method-events", &Vunread_input_method_events,
11236 doc: /* List of events to be processed as input by input methods. 11236 doc: /* List of events to be processed as input by input methods.
11237These events are processed after `unread-command-events', but 11237These events are processed after `unread-command-events', but
11238before actual keyboard input. */); 11238before actual keyboard input.
11239If there's an active input method, the events are given to
11240`input-method-function'. */);
11239 Vunread_input_method_events = Qnil; 11241 Vunread_input_method_events = Qnil;
11240 11242
11241 DEFVAR_LISP ("meta-prefix-char", &meta_prefix_char, 11243 DEFVAR_LISP ("meta-prefix-char", &meta_prefix_char,