diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/progmodes/f90.el | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8c6fbae8b32..edeafa6aa94 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -3,6 +3,8 @@ * progmodes/f90.el (f90-xemacs-flag): New variable. (f90-mark-subprogram-overlay): New variable. (f90-mark-subprogram): Now it highlights the subprogram. + (f90-font-lock-keywords-1, f90-font-lock-keywords-2): Fix + highlighting of various "type" forms. 2002-04-28 Colin Walters <walters@verbum.org> diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el index c21d7bcd356..af8eed0ba62 100644 --- a/lisp/progmodes/f90.el +++ b/lisp/progmodes/f90.el @@ -340,8 +340,8 @@ The options are 'downcase-word, 'upcase-word, 'capitalize-word and nil." ;; Special highlighting of "module procedure foo-list" '("\\<\\(module[ \t]*procedure\\)\\>" (1 font-lock-keyword-face)) ;; Highlight definition of new type - '("\\<\\(type\\)[ \t]*\\(.*::[ \t]*\\|[ \t]+\\)\\(\\sw+\\)" - (1 font-lock-keyword-face) (3 font-lock-function-name-face)) +;;; '("\\<\\(type\\)[ \t]*\\(.*::[ \t]*\\|[ \t]+\\)\\(\\sw+\\)" +;;; (1 font-lock-keyword-face) (3 font-lock-function-name-face)) ;; Other functions and declarations. '("\\<\\(\\(?:end[ \t]*\\)?\\(program\\|module\\|function\\|subroutine\\|type\\)\\|use\\|call\\)\\>[ \t]*\\(\\sw+\\)?" (1 font-lock-keyword-face) (3 font-lock-function-name-face nil t)) @@ -353,7 +353,7 @@ The options are 'downcase-word, 'upcase-word, 'capitalize-word and nil." (list ;; Variable declarations (avoid the real function call) '("^[ \t0-9]*\\(real\\|integer\\|c\\(haracter\\|omplex\\)\\|logical\\|type[ \t]*(\\sw+)\\)\\(.*::\\|[ \t]*(.*)\\)?\\([^!\n]*\\)" - (1 font-lock-type-face) (4 font-lock-variable-name-face)) + (1 font-lock-type-face t) (4 font-lock-variable-name-face)) ;; do, if, select, where, and forall constructs '("\\<\\(end[ \t]*\\(do\\|if\\|select\\|forall\\|where\\)\\)\\>\\([ \t]+\\(\\sw+\\)\\)?" (1 font-lock-keyword-face) (3 font-lock-constant-face nil t)) |