[Emacs-diffs] trunk r114626: Menu item selection on TTYs is now cyclical.

[Eli Zaretskii]

------------------------------------------------------------
revno: 114626
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2013-10-11 17:42:05 +0300
message:
  Menu item selection on TTYs is now cyclical.
  
   src/term.c (read_menu_input): Make selection of menu items
   cyclical.  Suggested by Dmitry Antipov <address@hidden>.
   (tty_menu_activate): Fix off-by-one error when computing max_y.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/term.c                     term.c-20091113204419-o5vbwnq5f7feedwu-220

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-10-11 13:47:35 +0000
+++ b/src/ChangeLog     2013-10-11 14:42:05 +0000
@@ -1,3 +1,9 @@
+2013-10-11  Eli Zaretskii  <address@hidden>
+
+       * term.c (read_menu_input): Make selection of menu items
+       cyclical.  Suggested by Dmitry Antipov <address@hidden>.
+       (tty_menu_activate): Fix off-by-one error when computing max_y.
+
 2013-10-11  Teodor Zlatanov  <address@hidden>
 
        * gnutls.c (gnutls_audit_log_function): Add function for GnuTLS

=== modified file 'src/term.c'
--- a/src/term.c        2013-10-11 11:11:28 +0000
+++ b/src/term.c        2013-10-11 14:42:05 +0000
@@ -3177,11 +3177,15 @@
        {
          if (*y < max_y)
            *y += 1;
+         else
+           *y = min_y;
        }
       else if (EQ (cmd, Qtty_menu_prev_item))
        {
          if (*y > min_y)
            *y -= 1;
+         else
+           *y = max_y;
        }
       else if (EQ (cmd, Qtty_menu_select))
        st = 1;
@@ -3290,7 +3294,7 @@
     {
       int input_status;
       int min_y = state[0].y;
-      int max_y = min (min_y + state[0].menu->count, FRAME_LINES (sf)) - 1;
+      int max_y = min (min_y + state[0].menu->count, FRAME_LINES (sf) - 1) - 1;
 
       input_status = read_menu_input (sf, &x, &y, min_y, max_y, &first_time);
       if (input_status)