[Emacs-diffs] Changes to emacs/lisp/font-lock.el

[Masatake YAMATO]

Index: emacs/lisp/font-lock.el
diff -u emacs/lisp/font-lock.el:1.296 emacs/lisp/font-lock.el:1.297
--- emacs/lisp/font-lock.el:1.296       Wed Mar 15 22:26:08 2006
+++ emacs/lisp/font-lock.el     Tue May  9 04:07:25 2006
@@ -1974,17 +1974,17 @@
 ;;
 ;;         (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 @@
     (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]*>?\\)"