diff options
-rw-r--r-- | src/ChangeLog | 4 | ||||
-rw-r--r-- | src/keyboard.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 381ae6b0989..93cd5f30f08 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2015-02-09 Stefan Monnier <monnier@iro.umontreal.ca> + + * keyboard.c (syms_of_keyboard): Use non-nil default value. + 2015-02-09 Paul Eggert <eggert@cs.ucla.edu> Use C99's INFINITY and NAN macros diff --git a/src/keyboard.c b/src/keyboard.c index ee621923c67..bcb51cfa1f2 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -11707,7 +11707,7 @@ the previous echo area message. The input method function should refer to the variables `input-method-use-echo-area' and `input-method-exit-on-first-char' for guidance on what to do. */); - Vinput_method_function = Qnil; + Vinput_method_function = Qlist; DEFVAR_LISP ("input-method-previous-message", Vinput_method_previous_message, |