*** /sources/egcs-19980628-backup/texinfo/makeinfo/makeinfo.c	Wed May 06 18:09:03 1998
--- /sources/egcs-19980628/texinfo/makeinfo/makeinfo.c	Thu Jul 02 16:01:27 1998
*************** main (argc, argv)
*** 1086,1096 ****
          case 'V':
            /* User requested version info. */
            print_version_info ();
! 	  printf (_("Copyright (C) %s Free Software Foundation, Inc.\n\
  There is NO warranty.  You may redistribute this software\n\
  under the terms of the GNU General Public License.\n\
  For more information about these matters, see the files named COPYING.\n"),
! 		  "1998");
            exit (NO_ERROR);
            break;
  
--- 1086,1096 ----
          case 'V':
            /* User requested version info. */
            print_version_info ();
!      printf (_("Copyright (C) %s Free Software Foundation, Inc.\n\
  There is NO warranty.  You may redistribute this software\n\
  under the terms of the GNU General Public License.\n\
  For more information about these matters, see the files named COPYING.\n"),
!         "1998");
            exit (NO_ERROR);
            break;
  
*************** find_and_load (filename)
*** 1236,1242 ****
  {
    struct stat fileinfo;
    long file_size;
!   int file = -1, count = 0;
    char *fullpath, *result, *get_file_info_in_path ();
  
    result = fullpath = (char *)NULL;
--- 1236,1242 ----
  {
    struct stat fileinfo;
    long file_size;
!   int n, file = -1, count = 0;
    char *fullpath, *result, *get_file_info_in_path ();
  
    result = fullpath = (char *)NULL;
*************** full_pathname (filename)
*** 1606,1613 ****
            strcpy (result, user_entry->pw_dir);
            strcat (result, &filename[i]);
          }
-     }
  #endif /* not WIN32 */
    return (result);
  }
  
--- 1606,1613 ----
            strcpy (result, user_entry->pw_dir);
            strcat (result, &filename[i]);
          }
  #endif /* not WIN32 */
+     }
    return (result);
  }
  
*************** get_until_in_line (expand, match, string
*** 1848,1854 ****
        input_text = xrealloc (input_text, new_len);
        strcpy (input_text + input_text_offset, xp);
        strncpy (input_text + input_text_offset + xp_len, str,
! 	       real_bottom - limit + 1);
        free (str);
        free (xp);
        
--- 1848,1854 ----
        input_text = xrealloc (input_text, new_len);
        strcpy (input_text + input_text_offset, xp);
        strncpy (input_text + input_text_offset + xp_len, str,
!           real_bottom - limit + 1);
        free (str);
        free (xp);
        
*************** defun_internal (type, x_p)
*** 7290,7296 ****
      case defop:
      case deftypemethod:
        execute_string ("%cfindex %s on %s\n",
! 		      COMMAND_PREFIX, defined_name, type_name);
        break;
      case deftp:
        execute_string ("%ctindex %s\n", COMMAND_PREFIX, defined_name);
--- 7290,7296 ----
      case defop:
      case deftypemethod:
        execute_string ("%cfindex %s on %s\n",
!             COMMAND_PREFIX, defined_name, type_name);
        break;
      case deftp:
        execute_string ("%ctindex %s\n", COMMAND_PREFIX, defined_name);