[Emacs-diffs] Changes to emacs/lib-src/etags.c

[Francesco Potortì]

Index: emacs/lib-src/etags.c
diff -c emacs/lib-src/etags.c:3.49 emacs/lib-src/etags.c:3.50
*** emacs/lib-src/etags.c:3.49  Thu Oct 20 13:13:17 2005
--- emacs/lib-src/etags.c       Fri Nov 18 13:56:44 2005
***************
*** 41,47 ****
   * configuration file containing regexp definitions for etags.
   */
  
! char pot_etags_version[] = "@(#) pot revision number is 17.14";
  
  #define       TRUE    1
  #define       FALSE   0
--- 41,47 ----
   * configuration file containing regexp definitions for etags.
   */
  
! char pot_etags_version[] = "@(#) pot revision number is 17.15";
  
  #define       TRUE    1
  #define       FALSE   0
***************
*** 479,485 ****
  
  /* STDIN is defined in LynxOS system headers */
  #ifdef STDIN
! #undef STDIN
  #endif
  
  #define STDIN 0x1001          /* returned by getopt_long on --parse-stdin */
--- 479,485 ----
  
  /* STDIN is defined in LynxOS system headers */
  #ifdef STDIN
! # undef STDIN
  #endif
  
  #define STDIN 0x1001          /* returned by getopt_long on --parse-stdin */
***************
*** 994,1002 ****
    if (CTAGS)
      {
        puts ("-v, --vgrind\n\
!         Generates an index of items intended for human consumption,\n\
!         similar to the output of vgrind.  The index is sorted, and\n\
!         gives the page number of each item.");
        puts ("-w, --no-warn\n\
          Suppress warning messages about entries defined in multiple\n\
          files.");
--- 994,1002 ----
    if (CTAGS)
      {
        puts ("-v, --vgrind\n\
!         Print on the standard output an index of items intended for\n\
!         human consumption, similar to the output of vgrind.  The index\n\
!         is sorted, and gives the page number of each item.");
        puts ("-w, --no-warn\n\
          Suppress warning messages about entries defined in multiple\n\
          files.");
***************
*** 1428,1434 ****
  
    if (!CTAGS || cxref_style)
      {
!       put_entries (nodehead); /* write the remaining tags (ETAGS) */
        free_tree (nodehead);
        nodehead = NULL;
        if (!CTAGS)
--- 1428,1435 ----
  
    if (!CTAGS || cxref_style)
      {
!       /* Write the remaining tags to tagf (ETAGS) or stdout (CXREF). */
!       put_entries (nodehead);
        free_tree (nodehead);
        nodehead = NULL;
        if (!CTAGS)
***************
*** 1442,1451 ****
  
          while (nincluded_files-- > 0)
            fprintf (tagf, "\f\n%s,include\n", *included_files++);
        }
  
-       if (fclose (tagf) == EOF)
-       pfatal (tagfile);
        exit (EXIT_SUCCESS);
      }
  
--- 1443,1453 ----
  
          while (nincluded_files-- > 0)
            fprintf (tagf, "\f\n%s,include\n", *included_files++);
+ 
+         if (fclose (tagf) == EOF)
+           pfatal (tagfile);
        }
  
        exit (EXIT_SUCCESS);
      }