* keyboard.c (Fcurrent_idle_time): Reflow docstring.

  (syms_of_keyboard) <command-hook-internal, input-method-function>:
  Fix typos in docstrings.

diff --git a/src/ChangeLog b/src/ChangeLog
index 7017875564ba9f6bfe4e7517224c2f4d6ccd33b3..8812516e41ce2a555b7bb5c396d8ab09da2eb91c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,8 +1,14 @@
+2009-03-20  Juanma Barranquero  <lekktu@gmail.com>
+
+       * keyboard.c (Fcurrent_idle_time): Reflow docstring.
+       (syms_of_keyboard) <command-hook-internal, input-method-function>:
+       Fix typos in docstrings.
+
 2009-03-19  Kenichi Handa  <handa@m17n.org>
 
        * fontset.c (Fset_fontset_font): When a spec of ASCII font is
-       changed, use font_load_for_lface to get a new font object.  Call
-       free_realized_fontset after handling ASCII font change.
+       changed, use font_load_for_lface to get a new font object.
+       Call free_realized_fontset after handling ASCII font change.
 
        * frame.c (x_set_font): Handle the case that ARG is a cons.
 
@@ -59,7 +65,7 @@
        * w32fns.c (w32_wnd_proc): Change WM_PAINT to WM_EMACS_PAINT
        before passing to lisp thread.  (Bug#950)
 
-2009-03-14  David Reitter <david.reitter@gmail.com>
+2009-03-14  David Reitter  <david.reitter@gmail.com>
 
        * nsterm.m (ns_shutdown_properly, -terminate): Remove global state
        variable as it was never reset.
@@ -78,7 +84,7 @@
        * sound.c (alsa_configure): Remove call to deprecated
        snd_pcm_sw_params_set_xfer_align.
 
-2009-03-14  Stephen Berman <stephen.berman@gmx.net>
+2009-03-14  Stephen Berman  <stephen.berman@gmx.net>
 
        * gtkutil.c (xg_tool_bar_callback): Set focus back to the frame
        after clicking in a detached tool bar.

diff --git a/src/keyboard.c b/src/keyboard.c
index 0052a489e88b4cf1df091f8949e11cca002bbd20..1bdf9a37b50e856b50fe111ca80720d0513a738c 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -4693,10 +4693,9 @@ timer_check (do_it_now)
 
 DEFUN ("current-idle-time", Fcurrent_idle_time, Scurrent_idle_time, 0, 0, 0,
        doc: /* Return the current length of Emacs idleness, or nil.
-The value when Emacs is idle is a list of three integers.  The first has the
-most significant 16 bits of the seconds, while the second has the
-least significant 16 bits.  The third integer gives the microsecond
-count.
+The value when Emacs is idle is a list of three integers.  The first has
+the most significant 16 bits of the seconds, while the second has the least
+significant 16 bits.  The third integer gives the microsecond count.
 
 The value when Emacs is not idle is nil.
 
@@ -12215,7 +12214,7 @@ Buffer modification stores t in this variable.  */);
   staticpro (&Qdeactivate_mark);
 
   DEFVAR_LISP ("command-hook-internal", &Vcommand_hook_internal,
-              doc: /* Temporary storage of pre-command-hook or post-command-hook.  */);
+              doc: /* Temporary storage of `pre-command-hook' or `post-command-hook'.  */);
   Vcommand_hook_internal = Qnil;
 
   DEFVAR_LISP ("pre-command-hook", &Vpre_command_hook,
@@ -12392,7 +12391,7 @@ to be used as input.  If it wants to put back some events
 to be reconsidered, separately, by the input method,
 it can add them to the beginning of `unread-command-events'.
 
-The input method function can find in `input-method-previous-method'
+The input method function can find in `input-method-previous-message'
 the previous echo area message.
 
 The input method function should refer to the variables