aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2013-10-09 23:18:38 +0300
committerEli Zaretskii2013-10-09 23:18:38 +0300
commit9f6a18d27ebab2f41edb60cc5c45af0222f8210f (patch)
treeb52d239e11af0b930338044e865fcc5990577aec /src
parent0486beac541c98698a73688991365298006f7cd3 (diff)
downloademacs-9f6a18d27ebab2f41edb60cc5c45af0222f8210f.tar.gz
emacs-9f6a18d27ebab2f41edb60cc5c45af0222f8210f.zip
Fix minor problems in text-mode menu display.
src/term.c (tty_menu_activate): Flush the output stream after showing the cursor, and don't mark the frame garbaged at exit from the function. Fixes redisplay glitches when moving from one menu to another.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog7
-rw-r--r--src/term.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 1a05203273f..0597c5d9f21 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
12013-10-09 Eli Zaretskii <eliz@gnu.org>
2
3 * term.c (tty_menu_activate): Flush the output stream after
4 showing the cursor, and don't mark the frame garbaged at exit from
5 the function. Fixes redisplay glitches when moving from one menu
6 to another.
7
12013-10-09 Jan Djärv <jan.h.d@swipnet.se> 82013-10-09 Jan Djärv <jan.h.d@swipnet.se>
2 9
3 * nsfns.m (Fns_convert_utf8_nfd_to_nfc): Check input for valid UTF-8 10 * nsfns.m (Fns_convert_utf8_nfd_to_nfc): Check input for valid UTF-8
diff --git a/src/term.c b/src/term.c
index c357f04cdc6..ad2e90dc795 100644
--- a/src/term.c
+++ b/src/term.c
@@ -3428,6 +3428,7 @@ tty_menu_activate (tty_menu *menu, int *pane, int *selidx,
3428 while (statecount--) 3428 while (statecount--)
3429 free_saved_screen (state[statecount].screen_behind); 3429 free_saved_screen (state[statecount].screen_behind);
3430 tty_show_cursor (tty); /* turn cursor back on */ 3430 tty_show_cursor (tty); /* turn cursor back on */
3431 fflush (tty->output);
3431 3432
3432/* Clean up any mouse events that are waiting inside Emacs event queue. 3433/* Clean up any mouse events that are waiting inside Emacs event queue.
3433 These events are likely to be generated before the menu was even 3434 These events are likely to be generated before the menu was even
@@ -3437,7 +3438,6 @@ tty_menu_activate (tty_menu *menu, int *pane, int *selidx,
3437 discard_mouse_events (); 3438 discard_mouse_events ();
3438 if (!kbd_buffer_events_waiting ()) 3439 if (!kbd_buffer_events_waiting ())
3439 clear_input_pending (); 3440 clear_input_pending ();
3440 SET_FRAME_GARBAGED (sf);
3441 return result; 3441 return result;
3442} 3442}
3443 3443