[5598] tidy-up

[Gavin D. Smith]

Revision: 5598
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5598
Author:   gavin
Date:     2014-05-23 22:10:57 +0000 (Fri, 23 May 2014)
Log Message:
-----------
tidy-up

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/info/filesys.c
    trunk/info/indices.c
    trunk/info/info-utils.c
    trunk/info/window.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-05-22 22:21:25 UTC (rev 5597)
+++ trunk/ChangeLog     2014-05-23 22:10:57 UTC (rev 5598)
@@ -1,3 +1,11 @@
+2014-05-23  Gavin Smith  <address@hidden>
+
+       * info/indices.c (info_indices_of_file_buffer): Slightly more
+       informative comment.
+       * info/filesys.c (info_find_fullpath): Disabled code removed.
+       * info/window.c: Inaccurate section label comment removed.
+       (window_make_window): Disabled code removed.
+
 2014-05-21  Gavin Smith  <address@hidden>
 
        * info/t/Init-intera.inc: Account for incomplete output from

Modified: trunk/info/filesys.c
===================================================================
--- trunk/info/filesys.c        2014-05-22 22:21:25 UTC (rev 5597)
+++ trunk/info/filesys.c        2014-05-23 22:10:57 UTC (rev 5598)
@@ -126,31 +126,7 @@
            && (IS_SLASH (partial[1])
                || (partial[1] == '.' && IS_SLASH (partial[2]))))
           || strchr (partial, '/'))
-    {
-      fullpath = info_add_extension (0, partial, finfo);
-#if 0
-      /* Don't limit paths to 1023 bytes, and don't ask for
-         1024 bytes when it isn't needed. 
-         This isn't really necessary, anyway: just do
-         fullpath = xstrdup (partial) and leave ".", ".." as
-         they are.  Always having the full absolute path isn't
-         necessary. */
-      fullpath = xcalloc (1, 1024);
-#if defined (HAVE_GETCWD)
-      if (!getcwd (fullpath, 1024))
-#else /*  !HAVE_GETCWD */
-      if (!getwd (fullpath))
-#endif /* !HAVE_GETCWD */
-        {
-          filesys_error_number = errno;
-          return partial;
-        }
-
-      strcat (fullpath, "/");
-      strcat (fullpath, partial);
-#endif
-    }
-
+    fullpath = info_add_extension (0, partial, finfo);
   /* If just a simple name element, look for it in the path. */
   else
     fullpath = info_file_in_path (partial, infopath (), finfo);

Modified: trunk/info/indices.c
===================================================================
--- trunk/info/indices.c        2014-05-22 22:21:25 UTC (rev 5597)
+++ trunk/info/indices.c        2014-05-23 22:10:57 UTC (rev 5598)
@@ -87,7 +87,7 @@
                         index_nodenames_slots, 10);
 }
 
-/* Find and return the indices of FILE_BUFFER.  The indices are defined
+/* Find and concatenate the indices of FILE_BUFFER.  The indices are defined
    as the first node in the file containing the word "Index" and any
    immediately following nodes whose names also contain "Index".  All such
    indices are concatenated and the result returned.  Neither the returned

Modified: trunk/info/info-utils.c
===================================================================
--- trunk/info/info-utils.c     2014-05-22 22:21:25 UTC (rev 5597)
+++ trunk/info/info-utils.c     2014-05-23 22:10:57 UTC (rev 5598)
@@ -1635,12 +1635,6 @@
 }
 
 
-/* **************************************************************** */
-/*                                                                  */
-/*                  Functions Static To This File                   */
-/*                                                                  */
-/* **************************************************************** */
-
 /* Return a pointer to the part of PATHNAME that simply defines the file. */
 char *
 filename_non_directory (char *pathname)

Modified: trunk/info/window.c
===================================================================
--- trunk/info/window.c 2014-05-22 22:21:25 UTC (rev 5597)
+++ trunk/info/window.c 2014-05-23 22:10:57 UTC (rev 5598)
@@ -314,15 +314,6 @@
 #endif
   active_window->flags |= W_UpdateWindow;
 
-  /* Readjust the new and old windows so that their modelines and contents
-     will be displayed correctly. */
-#if defined (NOTDEF)
-  /* We don't have to do this for WINDOW since window_set_node_of_window ()
-     already did. */
-  window_adjust_pagetop (window);
-  window_make_modeline (window);
-#endif /* NOTDEF */
-
   /* We do have to readjust the existing active window. */
   window_adjust_pagetop (active_window);
   window_make_modeline (active_window);