texinfo update (Wed Mar 5 05:23:01 EST 2008)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.847
retrieving revision 1.848
diff -u -r1.847 -r1.848
--- ChangeLog   5 Mar 2008 09:05:23 -0000       1.847
+++ ChangeLog   5 Mar 2008 10:04:25 -0000       1.848
@@ -1,5 +1,9 @@
 2008-03-05  Sergey Poznyakoff  <address@hidden>
 
+       * info/session.c (last_node_p): Remove unused variable.
+       (info_search_internal): Print a message if the search wraps over
+       the end or beginning of the document.
+
        * configure.ac (AM_INIT_AUTOMAKE): Move all automake options here.
        Add dist-bzip2 for completeness.
        * Makefile.am (AUTOMAKE_OPTIONS): Remove in favor of
Index: info/session.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/session.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- info/session.c      4 Mar 2008 11:47:36 -0000       1.31
+++ info/session.c      5 Mar 2008 10:04:10 -0000       1.32
@@ -1,5 +1,5 @@
 /* session.c -- user windowing interface to Info.
-   $Id: session.c,v 1.31 2008/03/04 11:47:36 gray Exp $
+   $Id: session.c,v 1.32 2008/03/05 10:04:10 gray Exp $
 
    Copyright (C) 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
    2004, 2007, 2008 Free Software Foundation, Inc.
@@ -981,8 +981,6 @@
 static int
 last_node_p (NODE *node)
 {
-  int last_node = 0;
-       
   info_next_label_of_node (node);
   if (!INFO_LABEL_FOUND ())
     {
@@ -3695,6 +3693,7 @@
       register int current_tag = 0, number_of_tags;
       char *last_subfile;
       TAG *tag;
+      char *msg = NULL;
 
       /* Find number of tags and current tag. */
       last_subfile = (char *)NULL;
@@ -3717,7 +3716,7 @@
       while (1)
         {
           NODE *node;
-
+         
           /* Allow C-g to quit the search, failing it if pressed. */
           return_if_control_g (-1);
 
@@ -3725,10 +3724,16 @@
           for (i = current_tag + dir; i != current_tag; i += dir)
             {
               if (i < 0)
-                i = number_of_tags - 1;
+               {
+                 msg = N_("Restarting search from the end of the document");
+                 i = number_of_tags - 1;
+               }
               else if (i == number_of_tags)
-                i = 0;
-
+               {
+                 msg = N_("Restarting search from the beginning of the 
document");
+                 i = 0;
+               }
+             
               tag = file_buffer->tags[i];
               if (tag->nodelen != 0)
                 break;
@@ -3778,7 +3783,12 @@
               /* Yes!  We win. */
               remember_window_and_node (window, node);
               if (!echo_area_is_active)
-                window_clear_echo_area ();
+               {
+                 if (msg)
+                   window_message_in_echo_area ("%s", gettext (msg), NULL);
+                 else
+                   window_clear_echo_area ();
+               }
               return (0);
             }
 
P ChangeLog
P info/session.c