emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Francesco Potortì
Subject: [Emacs-diffs] Changes to emacs/lib-src/etags.c
Date: Wed, 08 Sep 2004 12:35:46 -0400

Index: emacs/lib-src/etags.c
diff -c emacs/lib-src/etags.c:3.38 emacs/lib-src/etags.c:3.39
*** emacs/lib-src/etags.c:3.38  Fri May  7 15:29:22 2004
--- emacs/lib-src/etags.c       Wed Sep  8 16:30:31 2004
***************
*** 35,41 ****
   *
   */
  
! char pot_etags_version[] = "@(#) pot revision number is 16.56";
  
  #define       TRUE    1
  #define       FALSE   0
--- 35,41 ----
   *
   */
  
! char pot_etags_version[] = "@(#) pot revision number is 16.58";
  
  #define       TRUE    1
  #define       FALSE   0
***************
*** 76,81 ****
--- 76,88 ----
  # define _GNU_SOURCE 1                /* enables some compiler checks on GNU 
*/
  #endif
  
+ #ifdef LONG_OPTIONS
+ #  undef LONG_OPTIONS
+ #  define LONG_OPTIONS TRUE
+ #else
+ #  define LONG_OPTIONS  FALSE
+ #endif
+ 
  /* WIN32_NATIVE is for Xemacs.
     MSDOS, WINDOWSNT, DOS_NT are for Emacs. */
  #ifdef WIN32_NATIVE
***************
*** 147,153 ****
  # define S_ISREG(m)   (((m) & S_IFMT) == S_IFREG)
  #endif
  
! #ifdef LONG_OPTIONS
  # include <getopt.h>
  #else
  # define getopt_long(argc,argv,optstr,lopts,lind) getopt (argc, argv, optstr)
--- 154,160 ----
  # define S_ISREG(m)   (((m) & S_IFMT) == S_IFREG)
  #endif
  
! #if LONG_OPTIONS
  # include <getopt.h>
  #else
  # define getopt_long(argc,argv,optstr,lopts,lind) getopt (argc, argv, optstr)
***************
*** 465,471 ****
  # define need_filebuf FALSE
  #endif /* ETAGS_REGEXPS */
  
! #ifdef LONG_OPTIONS
  static struct option longopts[] =
  {
    { "packages-only",      no_argument,             &packages_only,     TRUE  
},
--- 472,478 ----
  # define need_filebuf FALSE
  #endif /* ETAGS_REGEXPS */
  
! #if LONG_OPTIONS
  static struct option longopts[] =
  {
    { "packages-only",      no_argument,             &packages_only,     TRUE  
},
***************
*** 845,856 ****
    printf ("Usage: %s [options] [[regex-option ...] file-name] ...\n\
  \n\
  These are the options accepted by %s.\n", progname, progname);
! #ifdef LONG_OPTIONS
!   puts ("You may use unambiguous abbreviations for the long option names.");
! #else
!   puts ("Long option names do not work with this executable, as it is not\n\
  linked with GNU getopt.");
- #endif /* LONG_OPTIONS */
    puts ("  A - as file name means read names from stdin (one per line).\n\
  Absolute names are stored in the output file as they are.\n\
  Relative ones are stored relative to the output file's directory.\n");
--- 852,862 ----
    printf ("Usage: %s [options] [[regex-option ...] file-name] ...\n\
  \n\
  These are the options accepted by %s.\n", progname, progname);
!   if (LONG_OPTIONS)
!     puts ("You may use unambiguous abbreviations for the long option names.");
!   else
!     puts ("Long option names do not work with this executable, as it is not\n\
  linked with GNU getopt.");
    puts ("  A - as file name means read names from stdin (one per line).\n\
  Absolute names are stored in the output file as they are.\n\
  Relative ones are stored relative to the output file's directory.\n");
***************
*** 1158,1166 ****
  #ifdef ETAGS_REGEXPS
    optstring = "-r:Rc:";
  #endif /* ETAGS_REGEXPS */
! #ifndef LONG_OPTIONS
!   optstring = optstring + 1;
! #endif /* LONG_OPTIONS */
    optstring = concat (optstring,
                      "Cf:Il:o:SVhH",
                      (CTAGS) ? "BxdtTuvw" : "aDi:");
--- 1164,1171 ----
  #ifdef ETAGS_REGEXPS
    optstring = "-r:Rc:";
  #endif /* ETAGS_REGEXPS */
!   if (LONG_OPTIONS)
!     optstring += 1;
    optstring = concat (optstring,
                      "Cf:Il:o:SVhH",
                      (CTAGS) ? "BxdtTuvw" : "aDi:");
***************
*** 6475,6488 ****
  static void
  suggest_asking_for_help ()
  {
! 
! #ifdef LONG_OPTIONS
! fprintf (stderr, "\tTry `%s %s' for a complete list of options.\n",
!        progname, "--help");
! #else
! fprintf (stderr, "\tTry `%s %s' for a complete list of options.\n",
!        progname, "-h");
! #endif
    exit (EXIT_FAILURE);
  }
  
--- 6480,6487 ----
  static void
  suggest_asking_for_help ()
  {
!   fprintf (stderr, "\tTry `%s %s' for a complete list of options.\n",
!          progname, LONG_OPTIONS ? "--help" : "-h");
    exit (EXIT_FAILURE);
  }
  




reply via email to

[Prev in Thread] Current Thread [Next in Thread]