Virgin import of GNU texinfo 4.0

1 files changed, 338 insertions, 25 deletions

diff --git a/contrib/texinfo/info/infomap.c b/contrib/texinfo/info/infomap.c
index 7591283..932435e 100644
--- a/contrib/texinfo/info/infomap.c
+++ b/contrib/texinfo/info/infomap.c
@@ -1,7 +1,7 @@
 /* infomap.c -- Keymaps for Info.
-   $Id: infomap.c,v 1.7 1997/07/31 20:37:32 karl Exp $
+   $Id: infomap.c,v 1.20 1999/06/25 21:57:40 karl Exp $
 
-   Copyright (C) 1993, 97 Free Software Foundation, Inc.
+   Copyright (C) 1993, 97, 98, 99 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -67,7 +67,7 @@ keymap_copy_keymap (map)
   return (keymap);
 }
 
-/* Free the keymap and it's descendents. */
+/* Free the keymap and its descendants. */
 void
 keymap_discard_keymap (map)
      Keymap (map);
@@ -141,49 +141,54 @@ keymap_bind_keyseq (map, keyseq, keyentry)
 
 /* Initialize the standard info keymaps. */
 
-Keymap info_keymap = (Keymap)NULL;
-Keymap echo_area_keymap = (Keymap)NULL;
+Keymap info_keymap = NULL;
+Keymap echo_area_keymap = NULL;
 
-void
-initialize_info_keymaps ()
+static void
+initialize_emacs_like_keymaps ()
 {
-  register int i;
+  int i;
   Keymap map;
 
   if (!info_keymap)
     {
       info_keymap = keymap_make_keymap ();
-      info_keymap[ESC].type = ISKMAP;
-      info_keymap[ESC].function = (VFunction *)keymap_make_keymap ();
-      info_keymap[Control ('x')].type = ISKMAP;
-      info_keymap[Control ('x')].function = (VFunction *)keymap_make_keymap ();
       echo_area_keymap = keymap_make_keymap ();
-      echo_area_keymap[ESC].type = ISKMAP;
-      echo_area_keymap[ESC].function = (VFunction *)keymap_make_keymap ();
-      echo_area_keymap[Control ('x')].type = ISKMAP;
-      echo_area_keymap[Control ('x')].function =
-        (VFunction *)keymap_make_keymap ();
     }
 
+  info_keymap[ESC].type = ISKMAP;
+  info_keymap[ESC].function = (VFunction *)keymap_make_keymap ();
+  info_keymap[Control ('x')].type = ISKMAP;
+  info_keymap[Control ('x')].function = (VFunction *)keymap_make_keymap ();
+
+  /* Bind the echo area insert routines.  Let's make all characters
+     insertable by default, regardless of which character set we might
+     be using.  */
+  for (i = 0; i < 256; i++)
+    echo_area_keymap[i].function = ea_insert;
+
+  echo_area_keymap[ESC].type = ISKMAP;
+  echo_area_keymap[ESC].function = (VFunction *) keymap_make_keymap ();
+  echo_area_keymap[Control ('x')].type = ISKMAP;
+  echo_area_keymap[Control ('x')].function
+    = (VFunction *) keymap_make_keymap ();
+
   /* Bind numeric arg functions for both echo area and info window maps. */
   for (i = '0'; i < '9' + 1; i++)
     {
-      ((Keymap) info_keymap[ESC].function)[i].function =
-        ((Keymap) echo_area_keymap[ESC].function)[i].function =
-          info_add_digit_to_numeric_arg;
+      ((Keymap) info_keymap[ESC].function)[i].function
+        = ((Keymap) echo_area_keymap[ESC].function)[i].function
+        = info_add_digit_to_numeric_arg;
     }
   ((Keymap) info_keymap[ESC].function)['-'].function =
     ((Keymap) echo_area_keymap[ESC].function)['-'].function =
       info_add_digit_to_numeric_arg;
 
+  info_keymap['-'].function = info_add_digit_to_numeric_arg;
+
   /* Bind the echo area routines. */
   map = echo_area_keymap;
 
-  /* Bind the echo area insert routines. */
-  for (i = 0; i < 160; i++)
-    if (isprint (i))
-      map[i].function = ea_insert;
-
   map[Control ('a')].function = ea_beg_of_line;
   map[Control ('b')].function = ea_backward;
   map[Control ('d')].function = ea_delete;
@@ -203,7 +208,12 @@ initialize_info_keymaps ()
   map[SPC].function = ea_complete;
   map[TAB].function = ea_complete;
   map['?'].function = ea_possible_completions;
+#ifdef __MSDOS__
+  /* PC users will lynch me if I don't give them their usual DEL effect...  */
+  map[DEL].function = ea_delete;
+#else
   map[DEL].function = ea_rubout;
+#endif
 
   /* Bind the echo area ESC keymap. */
   map = (Keymap)echo_area_keymap[ESC].function;
@@ -272,6 +282,7 @@ initialize_info_keymaps ()
   map[Control ('u')].function = info_universal_argument;
   map[Control ('v')].function = info_scroll_forward;
   map[','].function = info_next_index_match;
+  map['/'].function = info_search;
 
   for (i = '1'; i < '9' + 1; i++)
     map[i].function = info_menu_digit;
@@ -288,15 +299,19 @@ initialize_info_keymaps ()
   map['e'].function = info_end_of_node;
   map['f'].function = info_xref_item;
   map['g'].function = info_goto_node;
+  map['G'].function = info_menu_sequence;
   map['h'].function = info_get_info_help_node;
   map['i'].function = info_index_search;
+  map['I'].function = info_goto_invocation_node;
   map['l'].function = info_history_node;
   map['m'].function = info_menu_item;
   map['n'].function = info_next_node;
+  map['O'].function = info_goto_invocation_node;
   map['p'].function = info_prev_node;
   map['q'].function = info_quit;
   map['r'].function = info_xref_item;
   map['s'].function = info_search;
+  map['S'].function = info_search_case_sensitively;
   map['t'].function = info_top_node;
   map['u'].function = info_up_node;
   map[DEL].function = info_scroll_backward;
@@ -316,6 +331,281 @@ initialize_info_keymaps ()
 #if defined (NAMED_FUNCTIONS)
   map['x'].function = info_execute_command;
 #endif /* NAMED_FUNCTIONS */
+  map[DEL].function = info_scroll_other_window_backward;
+
+  /* Bind members in the Control-X map for Info windows. */
+  map = (Keymap)info_keymap[Control ('x')].function;
+
+  map[Control ('b')].function = list_visited_nodes;
+  map[Control ('c')].function = info_quit;
+  map[Control ('f')].function = info_view_file;
+  map[Control ('g')].function = info_abort_key;
+  map[Control ('v')].function = info_view_file;
+  map['0'].function = info_delete_window;
+  map['1'].function = info_keep_one_window;
+  map['2'].function = info_split_window;
+  map['^'].function = info_grow_window;
+  map['b'].function = select_visited_node;
+  map['k'].function = info_kill_node;
+  map['n'].function = info_search_next;
+  map['N'].function = info_search_previous;
+  map['o'].function = info_next_window;
+  map['t'].function = info_tile_windows;
+  map['w'].function = info_toggle_wrap;
+
+  /* Arrow key bindings for Info windows keymap. */
+  map = info_keymap;
+  keymap_bind_keyseq (map, term_kN, &map[Control ('v')]); /* pagedown */
+  keymap_bind_keyseq (map, term_ku, &map[Control ('p')]); /* up */
+  keymap_bind_keyseq (map, "\033OA", &map[Control ('p')]);
+  keymap_bind_keyseq (map, "\033[A", &map[Control ('p')]);
+  keymap_bind_keyseq (map, term_kd, &map[Control ('n')]); /* down */
+  keymap_bind_keyseq (map, "\033OB", &map[Control ('n')]);
+  keymap_bind_keyseq (map, "\033[B", &map[Control ('n')]);
+  keymap_bind_keyseq (map, term_kr, &map[Control ('f')]); /* right */
+  keymap_bind_keyseq (map, "\033OC", &map[Control ('f')]);
+  keymap_bind_keyseq (map, "\033[C", &map[Control ('f')]);
+  keymap_bind_keyseq (map, term_kl, &map[Control ('b')]); /* left */
+  keymap_bind_keyseq (map, "\033OD", &map[Control ('b')]);
+  keymap_bind_keyseq (map, "\033[D", &map[Control ('b')]);
+
+  map = (Keymap)info_keymap[ESC].function;
+  keymap_bind_keyseq (map, term_kl, &map['b']); /* left */
+  keymap_bind_keyseq (map, "\033OA", &map['b']);
+  keymap_bind_keyseq (map, "\033[A", &map['b']);
+  keymap_bind_keyseq (map, term_kr, &map['f']); /* right */
+  keymap_bind_keyseq (map, "\033OB", &map['f']);
+  keymap_bind_keyseq (map, "\033[B", &map['f']);
+  keymap_bind_keyseq (map, term_kN, &map[Control ('v')]); /* pagedown */
+  keymap_bind_keyseq (map, term_kP, &map[DEL]); /* pageup */
+
+  /* The alternative to this definition of a `main map' key in the
+     `ESC map' section, is something like:
+    keymap_bind_keyseq (map, term_kP, &((KeyMap)map[ESC].function).map['v']);
+  */
+  keymap_bind_keyseq (info_keymap/*sic*/, term_kP, &map['v']); /* pageup */
+}
+
+static void
+initialize_vi_like_keymaps ()
+{
+  register int i;
+  Keymap map;
+
+  if (!info_keymap)
+    {
+      info_keymap = keymap_make_keymap ();
+      echo_area_keymap = keymap_make_keymap ();
+    }
+
+  info_keymap[ESC].type = ISKMAP;
+  info_keymap[ESC].function = (VFunction *)keymap_make_keymap ();
+  info_keymap[Control ('x')].type = ISKMAP;
+  info_keymap[Control ('x')].function = (VFunction *)keymap_make_keymap ();
+
+  /* Bind the echo area insert routines. */
+  for (i = 0; i < 256; i++)
+    echo_area_keymap[i].function = ea_insert;
+
+  echo_area_keymap[ESC].type = ISKMAP;
+  echo_area_keymap[ESC].function = (VFunction *)keymap_make_keymap ();
+  echo_area_keymap[Control ('x')].type = ISKMAP;
+  echo_area_keymap[Control ('x')].function =
+    (VFunction *)keymap_make_keymap ();
+
+  /* Bind numeric arg functions for both echo area and info window maps. */
+  for (i = '0'; i < '9' + 1; i++)
+    {
+      info_keymap[i].function =
+        ((Keymap) echo_area_keymap[ESC].function)[i].function =
+	info_add_digit_to_numeric_arg;
+    }
+  info_keymap['-'].function =
+    ((Keymap) echo_area_keymap[ESC].function)['-'].function =
+      info_add_digit_to_numeric_arg;
+
+  /* Bind the echo area routines. */
+  map = echo_area_keymap;
+
+  map[Control ('a')].function = ea_beg_of_line;
+  map[Control ('b')].function = ea_backward;
+  map[Control ('d')].function = ea_delete;
+  map[Control ('e')].function = ea_end_of_line;
+  map[Control ('f')].function = ea_forward;
+  map[Control ('g')].function = ea_abort;
+  map[Control ('h')].function = ea_rubout;
+  map[Control ('k')].function = ea_kill_line;
+  map[Control ('l')].function = info_redraw_display;
+  map[Control ('q')].function = ea_quoted_insert;
+  map[Control ('t')].function = ea_transpose_chars;
+  map[Control ('u')].function = ea_abort;
+  map[Control ('v')].function = ea_quoted_insert;
+  map[Control ('y')].function = ea_yank;
+
+  map[LFD].function = ea_newline;
+  map[RET].function = ea_newline;
+  map[SPC].function = ea_complete;
+  map[TAB].function = ea_complete;
+  map['?'].function = ea_possible_completions;
+#ifdef __MSDOS__
+  /* PC users will lynch me if I don't give them their usual DEL effect...  */
+  map[DEL].function = ea_delete;
+#else
+  map[DEL].function = ea_rubout;
+#endif
+
+  /* Bind the echo area ESC keymap. */
+  map = (Keymap)echo_area_keymap[ESC].function;
+
+  map[Control ('g')].function = ea_abort;
+  map[Control ('h')].function = ea_backward_kill_word;
+  map[Control ('v')].function = ea_scroll_completions_window;
+  map['0'].function = ea_beg_of_line;
+  map['$'].function = ea_end_of_line;
+  map['b'].function = ea_backward_word;
+  map['d'].function = ea_kill_word;
+  map['f'].function = ea_forward_word;
+  map['h'].function = ea_forward;
+  map['l'].function = ea_backward;
+  map['w'].function = ea_forward_word;
+  map['x'].function = ea_delete;
+  map['X'].function = ea_kill_word;
+  map['y'].function = ea_yank_pop;
+  map['?'].function = ea_possible_completions;
+  map[TAB].function = ea_tab_insert;
+  map[DEL].function = ea_kill_word;
+
+  /* Bind the echo area Control-x keymap. */
+  map = (Keymap)echo_area_keymap[Control ('x')].function;
+
+  map['o'].function = info_next_window;
+  map[DEL].function = ea_backward_kill_line;
+
+  /* Arrow key bindings for echo area keymaps.  It seems that some
+     terminals do not match their termcap entries, so it's best to just
+     define everything with both of the usual prefixes.  */
+  map = echo_area_keymap;
+  keymap_bind_keyseq (map, term_ku, &map[Control ('p')]); /* up */
+  keymap_bind_keyseq (map, "\033OA", &map[Control ('p')]);
+  keymap_bind_keyseq (map, "\033[A", &map[Control ('p')]);
+  keymap_bind_keyseq (map, term_kd, &map[Control ('n')]); /* down */
+  keymap_bind_keyseq (map, "\033OB", &map[Control ('n')]);
+  keymap_bind_keyseq (map, "\033[B", &map[Control ('n')]);
+  keymap_bind_keyseq (map, term_kr, &map[Control ('f')]); /* right */
+  keymap_bind_keyseq (map, "\033OC", &map[Control ('f')]);
+  keymap_bind_keyseq (map, "\033[C", &map[Control ('f')]);
+  keymap_bind_keyseq (map, term_kl, &map[Control ('b')]); /* left */
+  keymap_bind_keyseq (map, "\033OD", &map[Control ('b')]);
+  keymap_bind_keyseq (map, "\033[D", &map[Control ('b')]);
+
+  map = (Keymap)echo_area_keymap[ESC].function;
+  keymap_bind_keyseq (map, term_kl, &map['b']); /* left */
+  keymap_bind_keyseq (map, "\033OA", &map['b']);
+  keymap_bind_keyseq (map, "\033[A", &map['b']);
+  keymap_bind_keyseq (map, term_kr, &map['f']); /* right */
+  keymap_bind_keyseq (map, "\033OB", &map['f']);
+  keymap_bind_keyseq (map, "\033[B", &map['f']);
+
+  /* Bind commands for Info window keymaps. */
+  map = info_keymap;
+  map[TAB].function = info_move_to_next_xref;
+  map[LFD].function = info_down_line;
+  map[RET].function = info_down_line;
+  map[SPC].function = info_scroll_forward;
+  map[Control ('a')].function = info_beginning_of_line;
+  map[Control ('b')].function = info_scroll_backward;
+  map[Control ('d')].function = info_scroll_half_screen_down;
+  map[Control ('e')].function = info_down_line;
+  map[Control ('f')].function = info_scroll_forward;
+  map[Control ('g')].function = info_abort_key;
+  map[Control ('k')].function = info_up_line;
+  map[Control ('l')].function = info_redraw_display;
+  map[Control ('n')].function = info_down_line;
+  map[Control ('p')].function = info_up_line;
+  map[Control ('r')].function = info_redraw_display;
+  map[Control ('s')].function = isearch_forward;
+  map[Control ('u')].function = info_scroll_half_screen_up;
+  map[Control ('v')].function = info_scroll_forward;
+  map[Control ('y')].function = info_up_line;
+  map[','].function = info_next_index_match;
+  map['/'].function = info_search;
+
+  for (i = '1'; i < '9' + 1; i++)
+    ((Keymap) info_keymap[ESC].function)[i].function = info_menu_digit;
+  ((Keymap) info_keymap[ESC].function)['0'].function = info_last_menu_item;
+
+  map['<'].function = info_first_node;
+  map['>'].function = info_last_node;
+  map['?'].function = info_search_backward;
+  map['['].function = info_global_prev_node;
+  map[']'].function = info_global_next_node;
+  map['\''].function = info_history_node;
+
+  map['b'].function = info_scroll_backward;
+  map['d'].function = info_scroll_half_screen_down;
+  map['e'].function = info_down_line;
+  map['E'].function = info_view_file;
+  map['f'].function = info_scroll_forward;
+  map['F'].function = info_scroll_forward;
+  map['g'].function = info_first_node;
+  map['G'].function = info_last_node;
+  map['h'].function = info_get_help_window;
+  map['H'].function = info_get_help_window;
+  map['i'].function = info_index_search;
+  map['I'].function = info_goto_invocation_node;
+  map['j'].function = info_down_line;
+  map['k'].function = info_up_line;
+  map['l'].function = info_history_node;
+  map['m'].function = info_menu_item;
+  map['n'].function = info_search_next;
+  map['N'].function = info_search_previous;
+  map['O'].function = info_goto_invocation_node;
+  map['p'].function = info_prev_node;
+  map['q'].function = info_quit;
+  map['Q'].function = info_quit;
+  map['r'].function = info_redraw_display;
+  map['R'].function = info_redraw_display;
+  map['s'].function = info_search;
+  map['S'].function = info_search_case_sensitively;
+  map['t'].function = info_top_node;
+  map['u'].function = info_scroll_half_screen_up;
+  map['w'].function = info_scroll_backward_set_window;
+  map['y'].function = info_up_line;
+  map['z'].function = info_scroll_forward_set_window;
+  map['Z'].function = NULL;	/* unbind, so it works to bind "ZZ" below */
+  map[DEL].function = info_scroll_backward;
+  keymap_bind_keyseq (map, ":q", &map['q']);
+  keymap_bind_keyseq (map, ":Q", &map['q']);
+  keymap_bind_keyseq (map, "ZZ", &map['q']);
+
+  /* Bind members in the ESC map for Info windows. */
+  map = (Keymap)info_keymap[ESC].function;
+  map[Control ('f')].function = info_show_footnotes;
+  map[Control ('g')].function = info_abort_key;
+  map[TAB].function = info_move_to_prev_xref;
+  map[SPC].function = info_scroll_forward;
+  map[Control ('v')].function = info_scroll_other_window;
+  map['<'].function = info_beginning_of_node;
+  map['>'].function = info_end_of_node;
+  map['/'].function = info_search;
+  map['?'].function = info_search_backward;
+  map['b'].function = info_beginning_of_node;
+  map['d'].function = info_dir_node;
+  map['e'].function = info_end_of_node;
+  map['f'].function = info_xref_item;
+  map['g'].function = info_select_reference_this_line;
+  map['h'].function = info_get_info_help_node;
+  map['m'].function = info_menu_item;
+  map['n'].function = info_search;
+  map['N'].function = info_search_backward;
+  map['r'].function = isearch_backward;
+  map['s'].function = isearch_forward;
+  map['t'].function = info_top_node;
+  map['v'].function = info_scroll_backward;
+#if defined (NAMED_FUNCTIONS)
+  map['x'].function = info_execute_command;
+#endif /* NAMED_FUNCTIONS */
+  map[DEL].function = info_scroll_other_window_backward;
 
   /* Bind members in the Control-X map for Info windows. */
   map = (Keymap)info_keymap[Control ('x')].function;
@@ -325,15 +615,27 @@ initialize_info_keymaps ()
   map[Control ('f')].function = info_view_file;
   map[Control ('g')].function = info_abort_key;
   map[Control ('v')].function = info_view_file;
+  map[LFD].function = info_select_reference_this_line;
+  map[RET].function = info_select_reference_this_line;
   map['0'].function = info_delete_window;
   map['1'].function = info_keep_one_window;
   map['2'].function = info_split_window;
   map['^'].function = info_grow_window;
   map['b'].function = select_visited_node;
+  map['g'].function = info_goto_node;
+  map['i'].function = info_index_search;
+  map['I'].function = info_goto_invocation_node;
   map['k'].function = info_kill_node;
+  map['n'].function = info_next_node;
   map['o'].function = info_next_window;
+  map['O'].function = info_goto_invocation_node;
+  map['p'].function = info_prev_node;
+  map['r'].function = info_xref_item;
   map['t'].function = info_tile_windows;
+  map['u'].function = info_up_node;
   map['w'].function = info_toggle_wrap;
+  map[','].function = info_next_index_match;
+  keymap_bind_keyseq (info_keymap, ":e", &map[Control ('v')]);
 
   /* Arrow key bindings for Info windows keymap. */
   map = info_keymap;
@@ -359,6 +661,7 @@ initialize_info_keymaps ()
   keymap_bind_keyseq (map, "\033OB", &map['f']);
   keymap_bind_keyseq (map, "\033[B", &map['f']);
   keymap_bind_keyseq (map, term_kN, &map[Control ('v')]); /* pagedown */
+  keymap_bind_keyseq (map, term_kP, &map[DEL]); /* pageup */
 
   /* The alternative to this definition of a `main map' key in the
      `ESC map' section, is something like:
@@ -366,3 +669,13 @@ initialize_info_keymaps ()
   */
   keymap_bind_keyseq (info_keymap/*sic*/, term_kP, &map['v']); /* pageup */
 }
+
+void
+initialize_info_keymaps ()
+{
+  if (vi_keys_p)
+    initialize_vi_like_keymaps ();
+  else
+    initialize_emacs_like_keymaps ();
+}
+