mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Merged from miles@gnu.org--gnu-2005 (patch 182-184, 691-699)

Browse source 
Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-691
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-692
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-693
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-694
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-695
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-696
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-697
   Checkout man/cc-mode.texi from CVS with RCS keywords disabled

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-698
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-699
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-182
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-183
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-184
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-496
This commit is contained in:
Karoly Lorentey 2006-01-17 00:56:42 +00:00
commit c3a63088aa
70 changed files with 3763 additions and 2601 deletions
Download patch file Download diff file Expand all files Collapse all files

72
lisp/font-lock.el
View file

@ -1963,6 +1963,78 @@ This function could be MATCHER in a MATCH-ANCHORED `font-lock-keywords' item."
(goto-char (or (scan-sexps (point) 1) (point-max))))
(goto-char (match-end 2)))
(error t)))))
;; C preprocessor(cpp) is used outside of C, C++ and Objective-C source file.
;; e.g. assembler code and GNU linker script in Linux kernel.
;; `cpp-font-lock-keywords' is handy for modes for the files.
;;
;; Here we cannot use `regexp-opt' because because regex-opt is not preloaded
;; while font-lock.el is preloaded to emacs. So values pre-calculated with
;; regexp-opt are used here.
;; `cpp-font-lock-keywords-source-directives' is calculated from:
;;
;; (regexp-opt
;; '("define" "elif" "else" "endif" "error" "file" "if" "ifdef"
;; "ifndef" "include" "line" "pragma" "undef"))
;;
(defconst cpp-font-lock-keywords-source-directives
"define\\|e\\(?:l\\(?:if\\|se\\)\\|ndif\\|rror\\)\\|file\\|i\\(?:f\\(?:n?def\\)?\\|nclude\\)\\|line\\|pragma\\|undef"
"Regular expressoin used in `cpp-font-lock-keywords'.")
;; `cpp-font-lock-keywords-source-depth' is calculated from:
;;
;; (regexp-opt-depth (regexp-opt
;; '("define" "elif" "else" "endif" "error" "file" "if" "ifdef"
;; "ifndef" "include" "line" "pragma" "undef")))
;;
(defconst cpp-font-lock-keywords-source-depth 0
"An integer representing regular expression depth of `cpp-font-lock-keywords-source-directives'.
Used in `cpp-font-lock-keywords'.")
(defconst cpp-font-lock-keywords
(let* ((directives cpp-font-lock-keywords-source-directives)
(directives-depth cpp-font-lock-keywords-source-depth))
(list
;;
;; Fontify error directives.
'("^#[ \t]*error[ \t]+\\(.+\\)" 1 font-lock-warning-face prepend)
;;
;; Fontify filenames in #include <...> preprocessor directives as strings.
'("^#[ \t]*\\(?:import\\|include\\)[ \t]*\\(<[^>\"\n]*>?\\)"
1 font-lock-string-face prepend)
;;
;; Fontify function macro names.
'("^#[ \t]*define[ \t]+\\([[:alpha:]_][[:alnum:]_$]*\\)("
(1 font-lock-function-name-face prepend)
;;
;; Macro arguments.
((lambda (limit)
(re-search-forward
"\\(?:\\([[:alpha:]_][[:alnum:]_]*\\)[,]?\\)"
(or (save-excursion (re-search-forward ")" limit t))
limit)
t))
nil nil (1 font-lock-variable-name-face prepend)))
;;
;; Fontify symbol names in #elif or #if ... defined preprocessor directives.
'("^#[ \t]*\\(?:elif\\|if\\)\\>"
("\\<\\(defined\\)\\>[ \t]*(?\\([[:alpha:]_][[:alnum:]_]*\\)?" nil nil
(1 font-lock-builtin-face prepend) (2 font-lock-variable-name-face prepend t)))
;;
;; Fontify otherwise as symbol names, and the preprocessor directive names.
(list
(concat "^\\(#[ \t]*\\(?:" directives
"\\)\\)\\>[ \t!]*\\([[:alpha:]_][[:alnum:]_]*\\)?")
'(1 font-lock-preprocessor-face prepend)
(list (+ 2 directives-depth)
'font-lock-variable-name-face nil t))))
"Font lock keyords for C preprocessor directives.
`c-mode', `c++-mode' and `objc-mode' have their own
font lock keyords for C preprocessor directives. This definition is for the
other modes in which C preprocessor directives are used. e.g. `asm-mode' and
`ld-script-mode'.")
;; Lisp.