comparison lisp/progmodes/cc-fonts.el @ 83194:b15f799f66b5

Merged in changes from CVS trunk. Patches applied: * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-489 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-490 Update from CVS: man/fixit.texi (Spelling): Fix typo. * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-491 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-492 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-493 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-494 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-495 Update from CVS: Add missing lisp/mh-e files * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-496 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-497 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-498 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-499 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-500 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-234

83193:e6f198d9e7d3

	   1 font-lock-keyword-face))

      ;; Fontify leading identifiers in fully qualified names like
      ;; "foo::bar" in languages that supports such things.
      ,@(when (c-lang-const c-opt-identifier-concat-key)
	  `((,(byte-compile
	       ;; Must use a function here since we match longer
	       ;; than we want to move before doing a new search.
	       ;; This is not necessary for XEmacs >= 20 since it
	       ;; restarts the search from the end of the first
	       ;; highlighted submatch (something that causes
	       ;; problems in other places).
	       `(lambda (limit)
		  (while (re-search-forward
			  ,(concat "\\(\\<" ; 1
				   "\\(" (c-lang-const c-symbol-key) "\\)" ; 2
				   "[ \t\n\r\f\v]*"
				   (c-lang-const c-opt-identifier-concat-key)
				   "[ \t\n\r\f\v]*"
				   "\\)"
				   "\\("
				   (c-lang-const c-opt-after-id-concat-key)
				   "\\)")
			  limit t)
		    (unless (progn
			      (goto-char (match-beginning 0))
			      (c-skip-comments-and-strings limit))
		      (or (get-text-property (match-beginning 2) 'face)
			  (c-put-font-lock-face (match-beginning 2)
						(match-end 2)
						c-reference-face-name))
		      (goto-char (match-end 1)))))))))

      ;; Fontify the special declarations in Objective-C.
      ,@(when (c-major-mode-is 'objc-mode)
	  `(;; Fontify class names in the beginning of message expressions.
	    ,(c-make-font-lock-search-function

		(c-safe (goto-char (scan-lists (point) 1 paren-depth))))

	    (<= (point) limit)

	    ;; Search syntactically to the end of the declarator (";",
	    ;; ",", ")", ">" (for <> arglists), eob etc) or to the
	    ;; beginning of an initializer or function prototype ("="
	    ;; or "\\s\(").
	    (c-syntactic-re-search-forward
	     "[\];,\{\}\[\)>]\\|\\'\\|\\(=\\|\\(\\s\(\\)\\)" limit t t))

      (setq next-pos (match-beginning 0)
	    id-face (if (match-beginning 2)
			'font-lock-function-name-face
		      'font-lock-variable-name-face)
	    got-init (match-beginning 1))

      (if types
	  ;; Register and fontify the identifer as a type.
	  (let ((c-promote-possible-types t))
	    (goto-char id-start)

	       (if (c-safe (c-forward-sexp 1) t)
		   (c-forward-syntactic-ws limit)
		 (goto-char limit)))

	      (got-init
	       ;; Skip an initializer expression.
	       (if (c-syntactic-re-search-forward "[;,]" limit 'move t)
		   (backward-char)))

	      (t (c-forward-syntactic-ws limit)))

	;; If a ',' is found we set pos to the next declarator and iterate.
	(when (and (< (point) limit) (looking-at ","))

83194:b15f799f66b5

	   1 font-lock-keyword-face))

      ;; Fontify leading identifiers in fully qualified names like
      ;; "foo::bar" in languages that supports such things.
      ,@(when (c-lang-const c-opt-identifier-concat-key)
	  (if (c-major-mode-is 'java-mode)
	      ;; Java needs special treatment since "." is used both to
	      ;; qualify names and in normal indexing.  Here we look for
	      ;; capital characters at the beginning of an identifier to
	      ;; recognize the class.  "*" is also recognized to cover
	      ;; wildcard import declarations.  All preceding dot separated
	      ;; identifiers are taken as package names and therefore
	      ;; fontified as references.
	      `(,(c-make-font-lock-search-function
		  ;; Search for class identifiers preceded by ".".  The
		  ;; anchored matcher takes it from there.
		  (concat (c-lang-const c-opt-identifier-concat-key)
			  "[ \t\n\r\f\v]*"
			  (concat "\\("
				  "[" c-upper "][" (c-lang-const c-symbol-chars) "]*"
				  "\\|"
				  "\\*"
				  "\\)"))
		  `((let (id-end)
		      (goto-char (1+ (match-beginning 0)))
		      (while (and (eq (char-before) ?.)
				  (progn
				    (backward-char)
				    (c-backward-syntactic-ws)
				    (setq id-end (point))
				    (< (skip-chars-backward
					,(c-lang-const c-symbol-chars)) 0))
				  (not (get-text-property (point) 'face)))
			(c-put-font-lock-face (point) id-end c-reference-face-name)
			(c-backward-syntactic-ws)))
		    nil
		    (goto-char (match-end 0)))))

	    `((,(byte-compile
		 ;; Must use a function here since we match longer than we
		 ;; want to move before doing a new search.  This is not
		 ;; necessary for XEmacs >= 20 since it restarts the search
		 ;; from the end of the first highlighted submatch (something
		 ;; that causes problems in other places).
		 `(lambda (limit)
		    (while (re-search-forward
			    ,(concat "\\(\\<" ; 1
				     "\\(" (c-lang-const c-symbol-key) "\\)" ; 2
				     "[ \t\n\r\f\v]*"
				     (c-lang-const c-opt-identifier-concat-key)
				     "[ \t\n\r\f\v]*"
				     "\\)"
				     "\\("
				     (c-lang-const c-opt-after-id-concat-key)
				     "\\)")
			    limit t)
		      (unless (progn
				(goto-char (match-beginning 0))
				(c-skip-comments-and-strings limit))
			(or (get-text-property (match-beginning 2) 'face)
			    (c-put-font-lock-face (match-beginning 2)
						  (match-end 2)
						  c-reference-face-name))
			(goto-char (match-end 1))))))))))

      ;; Fontify the special declarations in Objective-C.
      ,@(when (c-major-mode-is 'objc-mode)
	  `(;; Fontify class names in the beginning of message expressions.
	    ,(c-make-font-lock-search-function

		(c-safe (goto-char (scan-lists (point) 1 paren-depth))))

	    (<= (point) limit)

	    ;; Search syntactically to the end of the declarator (";",
	    ;; ",", a closen paren, eob etc) or to the beginning of an
	    ;; initializer or function prototype ("=" or "\\s\(").
	    ;; Note that the open paren will match array specs in
	    ;; square brackets, and we treat them as initializers too.
	    (c-syntactic-re-search-forward
	     "[;,]\\|\\s)\\|\\'\\|\\(=\\|\\s(\\)" limit t t))

      (setq next-pos (match-beginning 0)
	    id-face (if (eq (char-after next-pos) ?\()
			'font-lock-function-name-face
		      'font-lock-variable-name-face)
	    got-init (and (match-beginning 1)
			  (char-after (match-beginning 1))))

      (if types
	  ;; Register and fontify the identifer as a type.
	  (let ((c-promote-possible-types t))
	    (goto-char id-start)

	       (if (c-safe (c-forward-sexp 1) t)
		   (c-forward-syntactic-ws limit)
		 (goto-char limit)))

	      (got-init
	       ;; Skip an initializer expression.  If we're at a '='
	       ;; then accept a brace list directly after it to cope
	       ;; with array initializers.  Otherwise stop at braces
	       ;; to avoid going past full function and class blocks.
	       (and (if (and (eq got-init ?=)
			     (= (c-forward-token-2) 0)
			     (looking-at "{"))
			(c-safe (c-forward-sexp) t)
		      t)
		    (c-syntactic-re-search-forward "[;,{]" limit 'move t)
		    (backward-char)))

	      (t (c-forward-syntactic-ws limit)))

	;; If a ',' is found we set pos to the next declarator and iterate.
	(when (and (< (point) limit) (looking-at ","))