From: Francesco Potortì <pot@gnu.org>
Date: Wed, 3 Sep 2003 14:18:03 +0000 (+0000)
Subject: (consider_token): check C++ `operator' only when the token len is long
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5537d7305e884260ebc4e8a457cf637691c566d4;p=emacs.git

(consider_token): check C++ `operator' only when the token len is long
enough.
---

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 95bd5e6c310..134eafc8d1e 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-25  Takaaki Ota  <Takaaki.Ota@am.sony.com>  (tiny change)
+
+	* etags.c (consider_token): check C++ `operator' only when the
+	token len is long enough.
+
 2003-05-03  Dave Love  <fx@gnu.org>
 
 	* Makefile.in [HAVE_LIBMAIL]: Check HAVE_LIBLOCKFILE.
diff --git a/lib-src/etags.c b/lib-src/etags.c
index faf5f7f06f2..817469ab1ee 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -2668,7 +2668,8 @@ consider_token (str, len, c, c_extp, cblev, parlev, is_func_or_var)
 	      fvdef = vignore;
 	      return FALSE;
 	    }
-	  if ((*c_extp & C_PLPL) && strneq (str+len-10, "::operator", 10))
+	  if ((*c_extp & C_PLPL) &&
+	      strneq (len >= 10 && str+len-10, "::operator", 10))
 	    {
 	      fvdef = foperator;
 	      *is_func_or_var = TRUE;