(cpp-font-lock-keywords-source-directives): Addded

"warning" and "import".
(cpp-font-lock-keywords): Added "warning".

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e417942..22b93e2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-09  Masatake YAMATO  <jet@gyve.org>
+
+       * font-lock.el (cpp-font-lock-keywords-source-directives): Addded
+       "warning" and "import".
+       (cpp-font-lock-keywords): Added "warning".
+
 2006-05-08  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * term/xterm.el (terminal-init-xterm): Add more key bindings.

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index d3017e3..207d3b8 100644 (file)
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1974,17 +1974,17 @@ This function could be MATCHER in a MATCH-ANCHORED `font-lock-keywords' item."
 ;;
 ;;         (regexp-opt
 ;;          '("define"  "elif" "else" "endif" "error" "file" "if" "ifdef"
-;;            "ifndef" "include" "line" "pragma" "undef"))
+;;            "ifndef" "import" "include" "line" "pragma" "undef" "warning"))
 ;;
 (defconst cpp-font-lock-keywords-source-directives
-  "define\\|e\\(?:l\\(?:if\\|se\\)\\|ndif\\|rror\\)\\|file\\|i\\(?:f\\(?:n?def\\)?\\|nclude\\)\\|line\\|pragma\\|undef"
+  "define\\|e\\(?:l\\(?:if\\|se\\)\\|ndif\\|rror\\)\\|file\\|i\\(?:f\\(?:n?def\\)?\\|mport\\|nclude\\)\\|line\\|pragma\\|undef\\|warning"
   "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")))
+;;                      "ifndef" "import" "include" "line" "pragma" "undef" "warning")))
 ;;
 (defconst cpp-font-lock-keywords-source-depth 0
   "An integer representing regular expression depth of `cpp-font-lock-keywords-source-directives'.
@@ -1996,7 +1996,7 @@ Used in `cpp-font-lock-keywords'.")
     (list
      ;;
      ;; Fontify error directives.
-     '("^#[ \t]*error[ \t]+\\(.+\\)" 1 font-lock-warning-face prepend)
+     '("^#[ \t]*\\(?:error\\|warning\\)[ \t]+\\(.+\\)" 1 font-lock-warning-face prepend)
      ;;
      ;; Fontify filenames in #include <...> preprocessor directives as strings.
      '("^#[ \t]*\\(?:import\\|include\\)[ \t]*\\(<[^>\"\n]*>?\\)"