Show
Ignore:
Timestamp:
05/13/06 11:31:18 (3 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lisp/font-lock.el

    r4058 r4079  
    19751975;;          (regexp-opt 
    19761976;;           '("define"  "elif" "else" "endif" "error" "file" "if" "ifdef" 
    1977 ;;             "ifndef" "include" "line" "pragma" "undef")) 
     1977;;             "ifndef" "import" "include" "line" "pragma" "undef" "warning")) 
    19781978;; 
    19791979(defconst cpp-font-lock-keywords-source-directives 
    1980   "define\\|e\\(?:l\\(?:if\\|se\\)\\|ndif\\|rror\\)\\|file\\|i\\(?:f\\(?:n?def\\)?\\|nclude\\)\\|line\\|pragma\\|undef" 
     1980  "define\\|e\\(?:l\\(?:if\\|se\\)\\|ndif\\|rror\\)\\|file\\|i\\(?:f\\(?:n?def\\)?\\|mport\\|nclude\\)\\|line\\|pragma\\|undef\\|warning" 
    19811981  "Regular expressoin used in `cpp-font-lock-keywords'.") 
    19821982 
    …… 
    19851985;;          (regexp-opt-depth (regexp-opt 
    19861986;;                     '("define"  "elif" "else" "endif" "error" "file" "if" "ifdef" 
    1987 ;;                       "ifndef" "include" "line" "pragma" "undef"))) 
     1987;;                       "ifndef" "import" "include" "line" "pragma" "undef" "warning"))) 
    19881988;; 
    19891989(defconst cpp-font-lock-keywords-source-depth 0 
    …… 
    19971997     ;; 
    19981998     ;; Fontify error directives. 
    1999      '("^#[ \t]*error[ \t]+\\(.+\\)" 1 font-lock-warning-face prepend) 
     1999     '("^#[ \t]*\\(?:error\\|warning\\)[ \t]+\\(.+\\)" 1 font-lock-warning-face prepend) 
    20002000     ;; 
    20012001     ;; Fontify filenames in #include <...> preprocessor directives as strings.