comparison lisp/font-lock.el @ 40339:6a06f9b1f448

(c-font-lock-keywords-2): Do not require labels to be alone on the line.

40338:ffc4cf9a7cbd

      ("\\(-[0-9]+\\|\\sw+\\)"
       ;; Return limit of search.
       (save-excursion (skip-chars-forward "^:\n") (point))
       nil
       (1 font-lock-constant-face nil t)))
    ;; Anders Lindgren <[e-mail]> points out that it is quicker to
    ;; use MATCH-ANCHORED to effectively anchor the regexp on the left.
    ;; This must come after the one for keywords and targets.
    '(":" ("^[ \t]*\\(\\sw+\\)[ \t]*:[ \t]*$"
	   (beginning-of-line) (end-of-line)
	   (1 font-lock-constant-face)))
    )))

 (setq c-font-lock-keywords-3
  (append c-font-lock-keywords-2
   ;;

      (list (concat "\\<\\(" ,c-type-specs "\\)\\>"
		    "[ \t]*\\(\\sw+\\)?")
	  (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 
		  ;; 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
			font-lock-variable-name-face) nil t))))

40339:6a06f9b1f448

      ("\\(-[0-9]+\\|\\sw+\\)"
       ;; Return limit of search.
       (save-excursion (skip-chars-forward "^:\n") (point))
       nil
       (1 font-lock-constant-face nil t)))
    '("\\(\\sw+\\)[ \t]*:" 1 font-lock-constant-face)
    )))

 (setq c-font-lock-keywords-3
  (append c-font-lock-keywords-2
   ;;

      (list (concat "\\<\\(" ,c-type-specs "\\)\\>"
		    "[ \t]*\\(\\sw+\\)?")
	  (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
		  ;; 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
			font-lock-variable-name-face) nil t))))