[5718] next, prev line; mouse capability check; stop binding to menu-digit

[Gavin D. Smith]

Revision: 5718
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5718
Author:   gavin
Date:     2014-07-24 13:20:27 +0000 (Thu, 24 Jul 2014)
Log Message:
-----------
next, prev line; mouse capability check; stop binding to menu-digit

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/info/infokey.c
    trunk/info/session.c
    trunk/info/terminal.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-07-24 12:31:22 UTC (rev 5717)
+++ trunk/ChangeLog     2014-07-24 13:20:27 UTC (rev 5718)
@@ -1,5 +1,13 @@
 2014-07-24  Gavin Smith  <address@hidden>
 
+       * info/infokey.c (compile): Don't allow binding to menu-digit.
+       * info/session.c (info_next_line, info_prev_line): Don't actually
+       move cursor until we have set the right column.
+       * info/terminal.c (terminal_begin_using_terminal): Check 'Km'
+       capability is what we expect it to be.
+
+2014-07-24  Gavin Smith  <address@hidden>
+
        * info/infokey.c (compile) <in_line_comment>: Use = where intended.
        (compile) <get_action>: Remove unused variable.
        * info/infomap.c (keymap_bind_keyseq): Remove unused variable.

Modified: trunk/info/infokey.c
===================================================================
--- trunk/info/infokey.c        2014-07-24 12:31:22 UTC (rev 5717)
+++ trunk/info/infokey.c        2014-07-24 13:20:27 UTC (rev 5718)
@@ -22,6 +22,7 @@
 #include "info.h"
 #include "infomap.h"
 #include "doc.h"
+#include "funs.h"
 #include "getopt.h"
 #include "variables.h"
 
@@ -440,8 +441,16 @@
                {
                  act[alen] = '\0';
                  a = lookup_action (act);
-                 if (a != -1)
+                  if (a == A_info_menu_digit)
                    {
+                      /* It does not make sense for menu-digit to be anything
+                         other than '0' .. '9'. */
+                     syntax_error (filename, lnum,
+                        _("cannot bind key sequence to menu-digit"));
+                     error = 1;
+                   }
+                  else if (a != -1)
+                   {
                       int keymap_bind_keyseq (Keymap, int *, KEYMAP_ENTRY *);
 
                       KEYMAP_ENTRY ke;

Modified: trunk/info/session.c
===================================================================
--- trunk/info/session.c        2014-07-24 12:31:22 UTC (rev 5717)
+++ trunk/info/session.c        2014-07-24 13:20:27 UTC (rev 5718)
@@ -1080,9 +1080,9 @@
       long saved_goal = window->goal_column;
       while (count--)
         point_next_line (window);
-      info_show_point (window);
       window->goal_column = saved_goal;
       move_to_goal_column (window);
+      info_show_point (window);
     }
 }
 
@@ -1096,9 +1096,9 @@
       long saved_goal = window->goal_column;
       while (count--)
         point_prev_line (window);
-      info_show_point (window);
       window->goal_column = saved_goal;
       move_to_goal_column (window);
+      info_show_point (window);
     }
 }
 

Modified: trunk/info/terminal.c
===================================================================
--- trunk/info/terminal.c       2014-07-24 12:31:22 UTC (rev 5717)
+++ trunk/info/terminal.c       2014-07-24 13:20:27 UTC (rev 5718)
@@ -140,7 +140,7 @@
      xterm.  The presence of the Km capability may not be a reliable way to
      tell whether this mode exists, but sending the following sequence is
      probably harmless if it doesn't.  */
-  if (term_Km)
+  if (term_Km && !strcmp (term_Km, "\033[M"))
     send_to_terminal ("\033[?1000h");
 
   if (term_keypad_on)