diff options
| author | David Kastrup | 2006-06-04 15:07:25 +0000 |
|---|---|---|
| committer | David Kastrup | 2006-06-04 15:07:25 +0000 |
| commit | d495ccfc5051c72b04a20b4cd0e84af7056ce11e (patch) | |
| tree | 400deec7d60dc18adac459e635d82b2fc439378c /src | |
| parent | 6dfbf803008ef9d5bd5a53cbe5848cc797c94938 (diff) | |
| download | emacs-d495ccfc5051c72b04a20b4cd0e84af7056ce11e.tar.gz emacs-d495ccfc5051c72b04a20b4cd0e84af7056ce11e.zip | |
Mention `redisplay-dont-pause' in doc string of
`sit-for'.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 13 | ||||
| -rw-r--r-- | src/dispnew.c | 3 |
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 @@ | |||
| 1 | 2006-06-04 David Kastrup <dak@gnu.org> | ||
| 2 | |||
| 3 | * dispnew.c: Mention `redisplay-dont-pause' in doc string of | ||
| 4 | `sit-for'. | ||
| 5 | |||
| 1 | 2006-06-03 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 6 | 2006-06-03 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
| 2 | 7 | ||
| 3 | * macfns.c (x_set_icon_name): Apply 2006-06-02 change for xfns.c. | 8 | * macfns.c (x_set_icon_name): Apply 2006-06-02 change for xfns.c. |
| @@ -8900,7 +8905,7 @@ | |||
| 8900 | 8905 | ||
| 8901 | * xfns.c (xic_create_xfontset): Initialize missing_list to NULL. | 8906 | * xfns.c (xic_create_xfontset): Initialize missing_list to NULL. |
| 8902 | 8907 | ||
| 8903 | 2004-10-21 K,Ba(Broly L,Bu(Brentey <lorentey@elte.hu> | 8908 | 2004-10-21 K,Aa(Broly L$,1 q(Brentey <lorentey@elte.hu> |
| 8904 | 8909 | ||
| 8905 | * xterm.h (x_output): New member `xic_base_fontname'. | 8910 | * xterm.h (x_output): New member `xic_base_fontname'. |
| 8906 | (FRAME_XIC_BASE_FONTNAME): New macro. | 8911 | (FRAME_XIC_BASE_FONTNAME): New macro. |
| @@ -9844,7 +9849,7 @@ | |||
| 9844 | * fileio.c (Fvisited_file_modtime): Return a list of two integers, | 9849 | * fileio.c (Fvisited_file_modtime): Return a list of two integers, |
| 9845 | instead of a cons. | 9850 | instead of a cons. |
| 9846 | 9851 | ||
| 9847 | 2004-07-14 K,Ba(Broly L,Bu(Brentey <lorentey@elte.hu> | 9852 | 2004-07-14 K,Aa(Broly L$,1 q(Brentey <lorentey@elte.hu> |
| 9848 | 9853 | ||
| 9849 | * keyboard.c (echo_dash): Do nothing if there already is a dash | 9854 | * keyboard.c (echo_dash): Do nothing if there already is a dash |
| 9850 | at the end of the echo string. | 9855 | at the end of the echo string. |
| @@ -10181,7 +10186,7 @@ | |||
| 10181 | * keyboard.c (cmd_error): Don't call any_kboard_state | 10186 | * keyboard.c (cmd_error): Don't call any_kboard_state |
| 10182 | if inside a recursive edit level. | 10187 | if inside a recursive edit level. |
| 10183 | 10188 | ||
| 10184 | 2004-06-13 K,Ba(Broly L,Bu(Brentey <lorentey@elte.hu> | 10189 | 2004-06-13 K,Aa(Broly L$,1 q(Brentey <lorentey@elte.hu> |
| 10185 | 10190 | ||
| 10186 | * keyboard.c (command_loop): Call any_kboard_state before | 10191 | * keyboard.c (command_loop): Call any_kboard_state before |
| 10187 | command_loop_2 when at top level. | 10192 | command_loop_2 when at top level. |
| @@ -10494,7 +10499,7 @@ | |||
| 10494 | before actually accepting connection in case it has already been | 10499 | before actually accepting connection in case it has already been |
| 10495 | accepted due to recursion. | 10500 | accepted due to recursion. |
| 10496 | 10501 | ||
| 10497 | 2004-05-23 K,Ba(Broly L,Bu(Brentey <lorentey@elte.hu> | 10502 | 2004-05-23 K,Aa(Broly L$,1 q(Brentey <lorentey@elte.hu> |
| 10498 | 10503 | ||
| 10499 | * coding.c (Fset_safe_terminal_coding_system_internal): | 10504 | * coding.c (Fset_safe_terminal_coding_system_internal): |
| 10500 | Set suppress_error in safe_terminal_coding, not terminal_coding. | 10505 | 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 | |||
| 6436 | if input is available before it starts. | 6436 | if input is available before it starts. |
| 6437 | Value is t if waited the full time with no input arriving. | 6437 | Value is t if waited the full time with no input arriving. |
| 6438 | 6438 | ||
| 6439 | Redisplay will occur even when input is available if you bind | ||
| 6440 | `redisplay-dont-pause' to a non-nil value. | ||
| 6441 | |||
| 6439 | An obsolete but still supported form is | 6442 | An obsolete but still supported form is |
| 6440 | \(sit-for SECONDS &optional MILLISECONDS NODISP) | 6443 | \(sit-for SECONDS &optional MILLISECONDS NODISP) |
| 6441 | Where the optional arg MILLISECONDS specifies an additional wait period, | 6444 | Where the optional arg MILLISECONDS specifies an additional wait period, |