diff options
| author | Erlang/OTP <[email protected]> | 2010-05-11 09:47:56 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-05-11 09:47:56 +0000 |
| commit | f7998b58f34f13791c5feee4326a5e4fa0a4d895 (patch) | |
| tree | 5d351f5b792ef95fa992a0ba791b76ad24280970 /lib | |
| parent | d3a3a830c0bfddb0f2a7ffbbb0fca5adecbb26ba (diff) | |
| parent | 5373c9cd8cecd4f06c93e30ed9c28acf1cfc8ecf (diff) | |
| download | otp-f7998b58f34f13791c5feee4326a5e4fa0a4d895.tar.gz otp-f7998b58f34f13791c5feee4326a5e4fa0a4d895.tar.bz2 otp-f7998b58f34f13791c5feee4326a5e4fa0a4d895.zip | |
Merge branch 'dgud/emacs-21-fix' into dev
* dgud/emacs-21-fix:
Remove usage of 'font-lock-preprocessor-face' if not available
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/tools/emacs/erlang.el | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el index a84f40244d..0132587d28 100644 --- a/lib/tools/emacs/erlang.el +++ b/lib/tools/emacs/erlang.el @@ -988,7 +988,7 @@ behaviour.") (list (concat "^\\(-" erlang-atom-regexp "\\)\\(\\s-\\|\\.\\|(\\)") 1 (if (boundp 'font-lock-preprocessor-face) 'font-lock-preprocessor-face - 'font-lock-function-name-face))) + 'font-lock-constant-face))) "Font lock keyword highlighting attributes.") (defvar erlang-font-lock-keywords-quotes @@ -1019,10 +1019,12 @@ are highlighted by syntactic analysis.") (list (list (concat "?\\s-*\\(" erlang-atom-regexp "\\|" erlang-variable-regexp "\\)") - 1 'font-lock-type-face) + 1 'font-lock-constant-face) (list (concat "^\\(-\\(?:define\\|ifn?def\\)\\)\\s-*(\\s-*\\(" erlang-atom-regexp "\\|" erlang-variable-regexp "\\)") - (list 1 'font-lock-preprocessor-face t) + (if (boundp 'font-lock-preprocessor-face) + (list 1 'font-lock-preprocessor-face t) + (list 1 'font-lock-constant-face t)) (list 3 'font-lock-type-face t t)) (list "^-e\\(lse\\|ndif\\)\\>" 0 'font-lock-preprocessor-face t)) "Font lock keyword highlighting macros. |