diff options
| author | Glenn Morris | 2002-04-28 23:38:51 +0000 |
|---|---|---|
| committer | Glenn Morris | 2002-04-28 23:38:51 +0000 |
| commit | 88b966631f87294cb73a95a92a34b076c51b6bc5 (patch) | |
| tree | da970bc8e268c8f76e4f45e852374d5b8ed9e2ad | |
| parent | 8201fbe901322283c2bda547a75ddecaa2589f55 (diff) | |
| download | emacs-88b966631f87294cb73a95a92a34b076c51b6bc5.tar.gz emacs-88b966631f87294cb73a95a92a34b076c51b6bc5.zip | |
(f90-font-lock-keywords-1, f90-font-lock-keywords-2): Fix highlighting of
various "type" forms.
| -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 @@ | |||
| 3 | * progmodes/f90.el (f90-xemacs-flag): New variable. | 3 | * progmodes/f90.el (f90-xemacs-flag): New variable. |
| 4 | (f90-mark-subprogram-overlay): New variable. | 4 | (f90-mark-subprogram-overlay): New variable. |
| 5 | (f90-mark-subprogram): Now it highlights the subprogram. | 5 | (f90-mark-subprogram): Now it highlights the subprogram. |
| 6 | (f90-font-lock-keywords-1, f90-font-lock-keywords-2): Fix | ||
| 7 | highlighting of various "type" forms. | ||
| 6 | 8 | ||
| 7 | 2002-04-28 Colin Walters <walters@verbum.org> | 9 | 2002-04-28 Colin Walters <walters@verbum.org> |
| 8 | 10 | ||
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." | |||
| 340 | ;; Special highlighting of "module procedure foo-list" | 340 | ;; Special highlighting of "module procedure foo-list" |
| 341 | '("\\<\\(module[ \t]*procedure\\)\\>" (1 font-lock-keyword-face)) | 341 | '("\\<\\(module[ \t]*procedure\\)\\>" (1 font-lock-keyword-face)) |
| 342 | ;; Highlight definition of new type | 342 | ;; Highlight definition of new type |
| 343 | '("\\<\\(type\\)[ \t]*\\(.*::[ \t]*\\|[ \t]+\\)\\(\\sw+\\)" | 343 | ;;; '("\\<\\(type\\)[ \t]*\\(.*::[ \t]*\\|[ \t]+\\)\\(\\sw+\\)" |
| 344 | (1 font-lock-keyword-face) (3 font-lock-function-name-face)) | 344 | ;;; (1 font-lock-keyword-face) (3 font-lock-function-name-face)) |
| 345 | ;; Other functions and declarations. | 345 | ;; Other functions and declarations. |
| 346 | '("\\<\\(\\(?:end[ \t]*\\)?\\(program\\|module\\|function\\|subroutine\\|type\\)\\|use\\|call\\)\\>[ \t]*\\(\\sw+\\)?" | 346 | '("\\<\\(\\(?:end[ \t]*\\)?\\(program\\|module\\|function\\|subroutine\\|type\\)\\|use\\|call\\)\\>[ \t]*\\(\\sw+\\)?" |
| 347 | (1 font-lock-keyword-face) (3 font-lock-function-name-face nil t)) | 347 | (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." | |||
| 353 | (list | 353 | (list |
| 354 | ;; Variable declarations (avoid the real function call) | 354 | ;; Variable declarations (avoid the real function call) |
| 355 | '("^[ \t0-9]*\\(real\\|integer\\|c\\(haracter\\|omplex\\)\\|logical\\|type[ \t]*(\\sw+)\\)\\(.*::\\|[ \t]*(.*)\\)?\\([^!\n]*\\)" | 355 | '("^[ \t0-9]*\\(real\\|integer\\|c\\(haracter\\|omplex\\)\\|logical\\|type[ \t]*(\\sw+)\\)\\(.*::\\|[ \t]*(.*)\\)?\\([^!\n]*\\)" |
| 356 | (1 font-lock-type-face) (4 font-lock-variable-name-face)) | 356 | (1 font-lock-type-face t) (4 font-lock-variable-name-face)) |
| 357 | ;; do, if, select, where, and forall constructs | 357 | ;; do, if, select, where, and forall constructs |
| 358 | '("\\<\\(end[ \t]*\\(do\\|if\\|select\\|forall\\|where\\)\\)\\>\\([ \t]+\\(\\sw+\\)\\)?" | 358 | '("\\<\\(end[ \t]*\\(do\\|if\\|select\\|forall\\|where\\)\\)\\>\\([ \t]+\\(\\sw+\\)\\)?" |
| 359 | (1 font-lock-keyword-face) (3 font-lock-constant-face nil t)) | 359 | (1 font-lock-keyword-face) (3 font-lock-constant-face nil t)) |