summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDavid Kastrup <dak@gnu.org>2006-06-04 15:07:25 +0000
committerDavid Kastrup <dak@gnu.org>2006-06-04 15:07:25 +0000
commitd495ccfc5051c72b04a20b4cd0e84af7056ce11e (patch)
tree400deec7d60dc18adac459e635d82b2fc439378c /src
parent6dfbf803008ef9d5bd5a53cbe5848cc797c94938 (diff)
downloademacs-d495ccfc5051c72b04a20b4cd0e84af7056ce11e.tar.gz
Mention `redisplay-dont-pause' in doc string of
`sit-for'.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog13
-rw-r--r--src/dispnew.c3
2 files changed, 12 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 31e235c65cc..ea00083fc56 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-04 David Kastrup <dak@gnu.org>
+
+ * dispnew.c: Mention `redisplay-dont-pause' in doc string of
+ `sit-for'.
+
2006-06-03 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* macfns.c (x_set_icon_name): Apply 2006-06-02 change for xfns.c.
@@ -8900,7 +8905,7 @@
* xfns.c (xic_create_xfontset): Initialize missing_list to NULL.
-2004-10-21 K,Ba(Broly L,Bu(Brentey <lorentey@elte.hu>
+2004-10-21 K,Aa(Broly L$,1 q(Brentey <lorentey@elte.hu>
* xterm.h (x_output): New member `xic_base_fontname'.
(FRAME_XIC_BASE_FONTNAME): New macro.
@@ -9844,7 +9849,7 @@
* fileio.c (Fvisited_file_modtime): Return a list of two integers,
instead of a cons.
-2004-07-14 K,Ba(Broly L,Bu(Brentey <lorentey@elte.hu>
+2004-07-14 K,Aa(Broly L$,1 q(Brentey <lorentey@elte.hu>
* keyboard.c (echo_dash): Do nothing if there already is a dash
at the end of the echo string.
@@ -10181,7 +10186,7 @@
* keyboard.c (cmd_error): Don't call any_kboard_state
if inside a recursive edit level.
-2004-06-13 K,Ba(Broly L,Bu(Brentey <lorentey@elte.hu>
+2004-06-13 K,Aa(Broly L$,1 q(Brentey <lorentey@elte.hu>
* keyboard.c (command_loop): Call any_kboard_state before
command_loop_2 when at top level.
@@ -10494,7 +10499,7 @@
before actually accepting connection in case it has already been
accepted due to recursion.
-2004-05-23 K,Ba(Broly L,Bu(Brentey <lorentey@elte.hu>
+2004-05-23 K,Aa(Broly L$,1 q(Brentey <lorentey@elte.hu>
* coding.c (Fset_safe_terminal_coding_system_internal):
Set suppress_error in safe_terminal_coding, not terminal_coding.
diff --git a/src/dispnew.c b/src/dispnew.c
index 89e2673d6c2..cbe0e3fb521 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -6436,6 +6436,9 @@ Redisplay is preempted as always if input arrives, and does not happen
if input is available before it starts.
Value is t if waited the full time with no input arriving.
+Redisplay will occur even when input is available if you bind
+`redisplay-dont-pause' to a non-nil value.
+
An obsolete but still supported form is
\(sit-for SECONDS &optional MILLISECONDS NODISP)
Where the optional arg MILLISECONDS specifies an additional wait period,