aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2014-06-04 13:54:58 +0300
committerEli Zaretskii2014-06-04 13:54:58 +0300
commit6032a3e83129a086629b96e67459083a223a1e03 (patch)
treed93bcc934d9b2cb0453308f94d971b521bf67a8b /src
parentd13adf6ddc858a988f88233fe6d73a8ca4a87cf7 (diff)
downloademacs-6032a3e83129a086629b96e67459083a223a1e03.tar.gz
emacs-6032a3e83129a086629b96e67459083a223a1e03.zip
Fix infloop of -nw session at exit on MS-Windows under a debugger.
src/sysdep.c (reset_sys_modes): Use cursorX, not curX, as the latter contains garbage on WINDOWSNT (which could potentially infloop at exit).
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/sysdep.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 16e3328a735..c6a68f5b90c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
12014-06-04 Eli Zaretskii <eliz@gnu.org> 12014-06-04 Eli Zaretskii <eliz@gnu.org>
2 2
3 * sysdep.c (reset_sys_modes): Use cursorX, not curX, as the latter
4 contains garbage on WINDOWSNT (which could potentially infloop at
5 exit).
6
3 Minimize cursor motion during TTY menu updates. 7 Minimize cursor motion during TTY menu updates.
4 * term.c (tty_menu_display): Don't position cursor here. Instead, 8 * term.c (tty_menu_display): Don't position cursor here. Instead,
5 pass the cursor coordinates to update_frame_with_menu. 9 pass the cursor coordinates to update_frame_with_menu.
diff --git a/src/sysdep.c b/src/sysdep.c
index 4e86dc903dc..e1fd86f5f3b 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -1245,7 +1245,7 @@ reset_sys_modes (struct tty_display_info *tty_out)
1245 int i; 1245 int i;
1246 tty_turn_off_insert (tty_out); 1246 tty_turn_off_insert (tty_out);
1247 1247
1248 for (i = curX (tty_out); i < FrameCols (tty_out) - 1; i++) 1248 for (i = cursorX (tty_out); i < FrameCols (tty_out) - 1; i++)
1249 { 1249 {
1250 fputc (' ', tty_out->output); 1250 fputc (' ', tty_out->output);
1251 } 1251 }