(c-font-lock-keywords-3): When matching something

like `struct X Y', finish with point after Y.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index aa7ba593558ad754444b57614814417578a93505..6cff9a1026992567758d521bff6191ceaf6b01a0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-04  Gerd Moellmann  <gerd@gnu.org>
+
+       * font-lock.el (c-font-lock-keywords-3): When matching something
+       like `struct X Y', finish with point after Y.
+
 2001-07-03  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * find-file.el (ff-find-the-other-file): Use file-name-nondirectory

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index d1315fbc794e9d712b98d6589d563ade04d4f8a2..424db62a064dafb659fa43b3c1c2bb68f4a1513e 100644 (file)
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -2372,7 +2372,11 @@ See also `c-font-lock-extra-types'.")
          (list 1 'font-lock-keyword-face)
          (list ,(+ c-type-specs-depth 2) 'font-lock-type-face nil t)
          (list 'font-lock-match-c-style-declaration-item-and-skip-to-next
-                 nil nil
+                 nil 
+                 ;; Finish with point after the variable name if
+                 ;; there is one.
+                 `(if (match-end 2) 
+                      (goto-char (match-end 2)))
                  ;; Fontify as a variable or function name.
                  '(1 (if (match-beginning 2)
                          font-lock-function-name-face