mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00
Code Issues Projects Releases Wiki Activity

(f90-font-lock-keywords-1): Fix highlighting of `type' forms.

Browse source 
(f90-font-lock-keywords-2): Fix highlighting of `implicit type(foo)' forms.
(f90-type-def-re): Fix value.
This commit is contained in:
Glenn Morris 2002-08-03 16:57:43 +00:00
parent db0bb807eb
commit 6fb453e1ea
2 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/ChangeLog
View file

@ -1,3 +1,10 @@
2002-08-03 Glenn Morris <gmorris@ast.cam.ac.uk>
* progmodes/f90.el (f90-font-lock-keywords-1): Fix highlighting of
`type' forms.
(f90-font-lock-keywords-2): Fix `implicit type(foo)' case.
(f90-type-def-re): Fix value.
2002-08-03 Kai Gro,b_(Bjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
* net/tramp.el: Version 2.0.6.

11
lisp/progmodes/f90.el
View file

@ -340,11 +340,12 @@ The options are 'downcase-word, 'upcase-word, 'capitalize-word and nil."
;; Special highlighting of "module procedure".
'("\\<\\(module[ \t]*procedure\\)\\>" (1 font-lock-keyword-face))
;; Highlight declaration of derived type.
;;; '("\\<\\(type\\)[ \t]*\\(.*::[ \t]*\\|[ \t]+\\)\\(\\sw+\\)"
;;; (1 font-lock-keyword-face) (3 font-lock-function-name-face))
'("\\<\\(\\(?:end[ \t]*\\)?type\\)\\>[ \t]*\\([^()\n]*::[ \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+\\)?"
subroutine\\)\\|use\\|call\\)\\>[ \t]*\\(\\sw+\\)?"
(1 font-lock-keyword-face) (3 font-lock-function-name-face nil t))
"\\<\\(\\(end[ \t]*\\)?\\(interface\\|block[ \t]*data\\)\\|contains\\)\\>")
"This does fairly subdued highlighting of comments and function calls.")
@ -366,7 +367,7 @@ do\\([ \t]*while\\)?\\|select[ \t]*case\\|where\\|forall\\)\\)\\>"
(2 font-lock-constant-face nil t) (3 font-lock-keyword-face))
;; Implicit declaration.
'("\\<\\(implicit\\)[ \t]*\\(real\\|integer\\|c\\(haracter\\|omplex\\)\
\\|logical\\|type[ \t]*(\\sw+)\\|none\\)\\>"
\\|logical\\|type[ \t]*(\\sw+)\\|none\\)[ \t]*"
(1 font-lock-keyword-face) (2 font-lock-type-face))
'("\\<\\(namelist\\|common\\)[ \t]*\/\\(\\sw+\\)?\/"
(1 font-lock-keyword-face) (2 font-lock-constant-face nil t))
@ -632,7 +633,7 @@ do\\([ \t]*while\\)?\\|select[ \t]*case\\|where\\|forall\\)\\)\\>"
"Regexp matching the end of a TYPE, INTERFACE, BLOCK DATA section.")
(defconst f90-type-def-re
"\\<\\(type\\)[ \t]+\\(\\sw+\\)\\>"
"\\<\\(type\\)\\>[ \t]*\\(?:[^()\n]*::[ \t]*\\)?\\(\\sw+\\)"
"Regexp matching the definition of a derived type.")
(defconst f90-no-break-re