[src/trunk]: src/gnu/dist/texinfo/info Fix merge botch.

[wiz <wiz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5fc1c92b251a
branches:  trunk
changeset: 514438:5fc1c92b251a
user:      wiz <wiz%NetBSD.org@localhost>
date:      Sun Sep 02 21:42:49 2001 +0000

description:
Fix merge botch.

diffstat:

 gnu/dist/texinfo/info/info.c     |  39 +--------------------------------------
 gnu/dist/texinfo/info/terminal.c |   4 +---
 2 files changed, 2 insertions(+), 41 deletions(-)

diffs (73 lines):

diff -r 42489d799a63 -r 5fc1c92b251a gnu/dist/texinfo/info/info.c
--- a/gnu/dist/texinfo/info/info.c      Sun Sep 02 21:26:49 2001 +0000
+++ b/gnu/dist/texinfo/info/info.c      Sun Sep 02 21:42:49 2001 +0000
@@ -1,5 +1,5 @@
 /* info.c -- Display nodes of Info files in multiple windows.
-   $Id: info.c,v 1.4 2001/07/25 16:46:19 assar Exp $
+   $Id: info.c,v 1.5 2001/09/02 21:42:49 wiz Exp $
 
    Copyright (C) 1993, 96, 97, 98, 99 Free Software Foundation, Inc.
 
@@ -376,43 +376,6 @@
       xexit (0);
     }
 
-  /* If the user specified `--index-search=STRING', start the info
-     session in the node corresponding to the first match. */
-  if (index_search_p)
-    {
-      int status = 0;
-
-      initialize_info_session (initial_node, 0);
-
-      if (index_entry_exists (windows, index_search_string))
-        {
-          terminal_clear_screen ();
-          terminal_prep_terminal ();
-          display_update_display (windows);
-          info_last_executed_command = (VFunction *)NULL;
-
-          do_info_index_search (windows, 0, index_search_string);
-
-          info_read_and_dispatch ();
-
-          terminal_unprep_terminal ();
-
-          /* On program exit, leave the cursor at the bottom of the
-             window, and restore the terminal IO. */
-          terminal_goto_xy (0, screenheight - 1);
-          terminal_clear_to_eol ();
-          fflush (stdout);
-        }
-      else
-        {
-          fputs (_("no entries found\n"), stderr);
-          status = 2;
-        }
-
-      close_dribble_file (); 
-      exit (status);
-    }
-
   /* If there are arguments remaining, they are the names of menu items
      in sequential info files starting from the first one loaded.  That
      file name is either "dir", or the contents of user_filename if one
diff -r 42489d799a63 -r 5fc1c92b251a gnu/dist/texinfo/info/terminal.c
--- a/gnu/dist/texinfo/info/terminal.c  Sun Sep 02 21:26:49 2001 +0000
+++ b/gnu/dist/texinfo/info/terminal.c  Sun Sep 02 21:42:49 2001 +0000
@@ -1,5 +1,5 @@
 /* terminal.c -- How to handle the physical terminal for Info.
-   $Id: terminal.c,v 1.4 2001/07/25 16:46:19 assar Exp $
+   $Id: terminal.c,v 1.5 2001/09/02 21:50:55 wiz Exp $
 
    Copyright (C) 1988, 89, 90, 91, 92, 93, 96, 97, 98, 99
    Free Software Foundation, Inc.
@@ -549,8 +549,6 @@
 
   buffer = term_string_buffer;
 
-  term_clrpag = term_cr = term_clreol = (char *)NULL;
-
   term_clrpag = term_cr = term_clreol = NULL;
 
   /* HP-UX 11.x returns 0 for OK --jeff.hull%state.co.us@localhost.  */