aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2009-03-20 09:41:19 +0000
committerJuanma Barranquero2009-03-20 09:41:19 +0000
commitf761d6b6a7905bd0611b6bf12d10c8a5346b6897 (patch)
treebba93b3e5b99efd1af9f24cdd8a583d865a9eff0
parent673e51692e2ae76661aff27a809574e0a5e1ece1 (diff)
downloademacs-f761d6b6a7905bd0611b6bf12d10c8a5346b6897.tar.gz
emacs-f761d6b6a7905bd0611b6bf12d10c8a5346b6897.zip
* keyboard.c (Fcurrent_idle_time): Reflow docstring.
(syms_of_keyboard) <command-hook-internal, input-method-function>: Fix typos in docstrings.
-rw-r--r--src/ChangeLog14
-rw-r--r--src/keyboard.c11
2 files changed, 15 insertions, 10 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7017875564b..8812516e41c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,8 +1,14 @@
12009-03-20 Juanma Barranquero <lekktu@gmail.com>
2
3 * keyboard.c (Fcurrent_idle_time): Reflow docstring.
4 (syms_of_keyboard) <command-hook-internal, input-method-function>:
5 Fix typos in docstrings.
6
12009-03-19 Kenichi Handa <handa@m17n.org> 72009-03-19 Kenichi Handa <handa@m17n.org>
2 8
3 * fontset.c (Fset_fontset_font): When a spec of ASCII font is 9 * fontset.c (Fset_fontset_font): When a spec of ASCII font is
4 changed, use font_load_for_lface to get a new font object. Call 10 changed, use font_load_for_lface to get a new font object.
5 free_realized_fontset after handling ASCII font change. 11 Call free_realized_fontset after handling ASCII font change.
6 12
7 * frame.c (x_set_font): Handle the case that ARG is a cons. 13 * frame.c (x_set_font): Handle the case that ARG is a cons.
8 14
@@ -59,7 +65,7 @@
59 * w32fns.c (w32_wnd_proc): Change WM_PAINT to WM_EMACS_PAINT 65 * w32fns.c (w32_wnd_proc): Change WM_PAINT to WM_EMACS_PAINT
60 before passing to lisp thread. (Bug#950) 66 before passing to lisp thread. (Bug#950)
61 67
622009-03-14 David Reitter <david.reitter@gmail.com> 682009-03-14 David Reitter <david.reitter@gmail.com>
63 69
64 * nsterm.m (ns_shutdown_properly, -terminate): Remove global state 70 * nsterm.m (ns_shutdown_properly, -terminate): Remove global state
65 variable as it was never reset. 71 variable as it was never reset.
@@ -78,7 +84,7 @@
78 * sound.c (alsa_configure): Remove call to deprecated 84 * sound.c (alsa_configure): Remove call to deprecated
79 snd_pcm_sw_params_set_xfer_align. 85 snd_pcm_sw_params_set_xfer_align.
80 86
812009-03-14 Stephen Berman <stephen.berman@gmx.net> 872009-03-14 Stephen Berman <stephen.berman@gmx.net>
82 88
83 * gtkutil.c (xg_tool_bar_callback): Set focus back to the frame 89 * gtkutil.c (xg_tool_bar_callback): Set focus back to the frame
84 after clicking in a detached tool bar. 90 after clicking in a detached tool bar.
diff --git a/src/keyboard.c b/src/keyboard.c
index 0052a489e88..1bdf9a37b50 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -4693,10 +4693,9 @@ timer_check (do_it_now)
4693 4693
4694DEFUN ("current-idle-time", Fcurrent_idle_time, Scurrent_idle_time, 0, 0, 0, 4694DEFUN ("current-idle-time", Fcurrent_idle_time, Scurrent_idle_time, 0, 0, 0,
4695 doc: /* Return the current length of Emacs idleness, or nil. 4695 doc: /* Return the current length of Emacs idleness, or nil.
4696The value when Emacs is idle is a list of three integers. The first has the 4696The value when Emacs is idle is a list of three integers. The first has
4697most significant 16 bits of the seconds, while the second has the 4697the most significant 16 bits of the seconds, while the second has the least
4698least significant 16 bits. The third integer gives the microsecond 4698significant 16 bits. The third integer gives the microsecond count.
4699count.
4700 4699
4701The value when Emacs is not idle is nil. 4700The value when Emacs is not idle is nil.
4702 4701
@@ -12215,7 +12214,7 @@ Buffer modification stores t in this variable. */);
12215 staticpro (&Qdeactivate_mark); 12214 staticpro (&Qdeactivate_mark);
12216 12215
12217 DEFVAR_LISP ("command-hook-internal", &Vcommand_hook_internal, 12216 DEFVAR_LISP ("command-hook-internal", &Vcommand_hook_internal,
12218 doc: /* Temporary storage of pre-command-hook or post-command-hook. */); 12217 doc: /* Temporary storage of `pre-command-hook' or `post-command-hook'. */);
12219 Vcommand_hook_internal = Qnil; 12218 Vcommand_hook_internal = Qnil;
12220 12219
12221 DEFVAR_LISP ("pre-command-hook", &Vpre_command_hook, 12220 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
12392to be reconsidered, separately, by the input method, 12391to be reconsidered, separately, by the input method,
12393it can add them to the beginning of `unread-command-events'. 12392it can add them to the beginning of `unread-command-events'.
12394 12393
12395The input method function can find in `input-method-previous-method' 12394The input method function can find in `input-method-previous-message'
12396the previous echo area message. 12395the previous echo area message.
12397 12396
12398The input method function should refer to the variables 12397The input method function should refer to the variables