Work correctly if CVSROOT specifies :fork: or

[gnu-emacs] / lib-src / etags.c

diff --git a/lib-src/etags.c b/lib-src/etags.c
index e9f1028d22286f6fd8da521f729d4ec9a4996354..e9fab1be3ee51b6a292f4f6ef085733522916714 100644 (file)
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -589,8 +589,8 @@ static char *Cplusplus_suffixes [] =
     "pdb",                     /* Postscript with C syntax */
     NULL };
 static char Cplusplus_help [] =
-"In C++ code, all the tag constructs of C code are tagged\n\
-(use --help --lang=c --lang=c++ for full help).\n\
+"In C++ code, all the tag constructs of C code are tagged.  (Use\n\
+--help --lang=c --lang=c++ for full help.)\n\
 In addition to C tags, member functions are also recognized, and\n\
 optionally member variables if you use the `--members' option.\n\
 Tags for variables and functions in classes are named `CLASS::VARIABLE'\n\
@@ -601,7 +601,7 @@ static char *Cjava_suffixes [] =
   { "java", NULL };
 static char Cjava_help [] =
 "In Java code, all the tags constructs of C and C++ code are\n\
-tagged (use --help --lang=c --lang=c++ --lang=java for full help).";
+tagged.  (Use --help --lang=c --lang=c++ --lang=java for full help.)";
 
 
 static char *Cobol_suffixes [] =
@@ -3116,7 +3116,7 @@ consider_token (str, len, c, c_extp, cblev, parlev, is_func_or_var)
              fvdef = vignore;
              return FALSE;
            }
-         if (strneq (str+len-10, "::operator", 10))
+         if (len >= 10 && strneq (str+len-10, "::operator", 10))
            {
              if (*c_extp & C_AUTO) /* automatic detection of C++ */
                *c_extp = (*c_extp | C_PLPL) & ~C_AUTO;
@@ -4192,7 +4192,7 @@ Fortran_functions (inf)
 /*
  * Ada parsing
  * Original code by
- * Philippe Waroquiers <philippe.waroquiers@eurocontrol.int> (1998)
+ * Philippe Waroquiers (1998)
  */
 
 static void Ada_getit __P((FILE *, char *));
@@ -6484,14 +6484,14 @@ pfatal (s1)
 static void
 suggest_asking_for_help ()
 {
-  fprintf (stderr, "\tTry `%s %s' for a complete list of options.\n",
-          progname,
+
 #ifdef LONG_OPTIONS
-          "--help"
+fprintf (stderr, "\tTry `%s %s' for a complete list of options.\n",
+        progname, "--help");
 #else
-          "-h"
+fprintf (stderr, "\tTry `%s %s' for a complete list of options.\n",
+        progname, "-h");
 #endif
-          );
   exit (BAD);
 }
 
@@ -6785,3 +6785,6 @@ xrealloc (ptr, size)
  * c-font-lock-extra-types: ("FILE" "bool" "language" "linebuffer" "fdesc" "node" "regexp")
  * End:
  */
+
+/* arch-tag: 8a9b748d-390c-4922-99db-2eeefa921051
+   (do not change this comment) */