diff options
| author | Gerd Moellmann | 2000-10-30 15:26:46 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2000-10-30 15:26:46 +0000 |
| commit | d4358b37bec6762190437fc14a5a4fbc1b894465 (patch) | |
| tree | 0cd9188867850419b1a7964a09d959dfbd7453c8 /src | |
| parent | 70c825df44c8cc44fbff1bda7a8e3fbbd16ed4b7 (diff) | |
| download | emacs-d4358b37bec6762190437fc14a5a4fbc1b894465.tar.gz emacs-d4358b37bec6762190437fc14a5a4fbc1b894465.zip | |
(echo_area_display): Don't perform a display update from
inside redisplay. The update will happen anyway at the end of
redisplay, and it can confuse redisplay (GC messages while
redisplaying, for instance.)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/xdisp.c | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index fb30f46ef5f..27830a88e07 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2000-10-30 Gerd Moellmann <gerd@gnu.org> | ||
| 2 | |||
| 3 | * xdisp.c (echo_area_display): Don't perform a display update from | ||
| 4 | inside redisplay. The update will happen anyway at the end of | ||
| 5 | redisplay, and it can confuse redisplay (GC messages while | ||
| 6 | redisplaying, for instance.) | ||
| 7 | |||
| 1 | 2000-10-30 Stefan Monnier <monnier@cs.yale.edu> | 8 | 2000-10-30 Stefan Monnier <monnier@cs.yale.edu> |
| 2 | 9 | ||
| 3 | * regex.c (re_iswctype, re_wctype_to_bit): Fix braino. | 10 | * regex.c (re_iswctype, re_wctype_to_bit): Fix braino. |
diff --git a/src/xdisp.c b/src/xdisp.c index f229198d8f4..e6149e4a453 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -6490,8 +6490,11 @@ echo_area_display (update_frame_p) | |||
| 6490 | window_height_changed_p = display_echo_area (w); | 6490 | window_height_changed_p = display_echo_area (w); |
| 6491 | w->must_be_updated_p = 1; | 6491 | w->must_be_updated_p = 1; |
| 6492 | 6492 | ||
| 6493 | /* Update the display, unless called from redisplay_internal. */ | 6493 | /* Update the display, unless called from redisplay_internal. |
| 6494 | if (update_frame_p) | 6494 | Also don't update the screen during redisplay itself. The |
| 6495 | update will happen at the end of redisplay, and an update | ||
| 6496 | here could cause confusion. */ | ||
| 6497 | if (update_frame_p && !redisplaying_p) | ||
| 6495 | { | 6498 | { |
| 6496 | int n = 0; | 6499 | int n = 0; |
| 6497 | 6500 | ||