[Emacs-diffs] emacs-24 r117042: src/term.c (tty_menu_activate): A better initialization for cursor coordinates.

[Eli Zaretskii]

------------------------------------------------------------
revno: 117042
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Thu 2014-05-01 18:59:42 +0300
message:
  src/term.c (tty_menu_activate): A better initialization for cursor 
coordinates.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/term.c                     term.c-20091113204419-o5vbwnq5f7feedwu-220

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-05-01 15:15:46 +0000
+++ b/src/ChangeLog     2014-05-01 15:59:42 +0000
@@ -1,3 +1,8 @@
+2014-05-01  Eli Zaretskii  <address@hidden>
+
+       * term.c (tty_menu_activate): A better initialization for cursor
+       coordinates.
+
 2014-05-01  Stefan Monnier  <address@hidden>
 
        * intervals.c: Tighten assertions.

=== modified file 'src/term.c'
--- a/src/term.c        2014-04-30 17:54:27 +0000
+++ b/src/term.c        2014-05-01 15:59:42 +0000
@@ -3240,7 +3240,10 @@
 
   /* Turn off the cursor.  Otherwise it shows through the menu
      panes, which is ugly.  */
+  col = cursorX (tty);
+  row = cursorY (tty);
   tty_hide_cursor (tty);
+
   if (buffers_num_deleted)
     menu->text[0][7] = ' ';
   onepane = menu->count == 1 && menu->submenu[0];
@@ -3378,8 +3381,6 @@
          col = cursorX (tty);
          row = cursorY (tty);
        }
-      else
-       row = -1;
 
       /* Display the help-echo message for the currently-selected menu
         item.  */
@@ -3391,8 +3392,7 @@
          /* Move the cursor to the beginning of the current menu
             item, so that screen readers and other accessibility aids
             know where the active region is.  */
-         if (0 <= row)
-           cursor_to (sf, row, col);
+         cursor_to (sf, row, col);
          tty_hide_cursor (tty);
          fflush (tty->output);
          prev_menu_help_message = menu_help_message;