comparison src/msdos.c @ 109793:b60dcdd855f0

Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Sun, 08 Aug 2010 22:52:25 +0000
parents d9a022ec322c
children 31def5db596a
comparison
equal deleted inserted replaced
109649:1f8f03cfcd2b 109793:b60dcdd855f0
1451 } 1451 }
1452 1452
1453 /* Look for a `help-echo' property. */ 1453 /* Look for a `help-echo' property. */
1454 { 1454 {
1455 Lisp_Object help; 1455 Lisp_Object help;
1456 extern Lisp_Object Qhelp_echo;
1457 1456
1458 /* Check overlays first. */ 1457 /* Check overlays first. */
1459 help = Qnil; 1458 help = Qnil;
1460 for (i = noverlays - 1; i >= 0 && NILP (help); --i) 1459 for (i = noverlays - 1; i >= 0 && NILP (help); --i)
1461 { 1460 {
1591 if (on && cursor_cleared) 1590 if (on && cursor_cleared)
1592 { 1591 {
1593 ScreenSetCursor (current_pos_Y, current_pos_X); 1592 ScreenSetCursor (current_pos_Y, current_pos_X);
1594 cursor_cleared = 0; 1593 cursor_cleared = 0;
1595 if (tty->termscript) 1594 if (tty->termscript)
1596 fprintf (tty->termscript, "\nCURSOR ON"); 1595 fprintf (tty->termscript, "\nCURSOR ON (%dx%d)",
1596 current_pos_Y, current_pos_X);
1597 } 1597 }
1598 else if (!on && !cursor_cleared) 1598 else if (!on && !cursor_cleared)
1599 { 1599 {
1600 ScreenSetCursor (-1, -1); 1600 ScreenSetCursor (-1, -1);
1601 cursor_cleared = 1; 1601 cursor_cleared = 1;
1602 if (tty->termscript) 1602 if (tty->termscript)
1603 fprintf (tty->termscript, "\nCURSOR OFF"); 1603 fprintf (tty->termscript, "\nCURSOR OFF (%dx%d)",
1604 current_pos_Y, current_pos_X);
1604 } 1605 }
1605 } 1606 }
1606 1607
1607 /* Emacs calls cursor-movement functions a lot when it updates the 1608 /* Emacs calls cursor-movement functions a lot when it updates the
1608 display (probably a legacy of old terminals where you cannot 1609 display (probably a legacy of old terminals where you cannot