[Emacs-diffs] Changes to emacs/lisp/progmodes/f90.el

[Glenn Morris]

Index: emacs/lisp/progmodes/f90.el
diff -c emacs/lisp/progmodes/f90.el:1.41 emacs/lisp/progmodes/f90.el:1.42
*** emacs/lisp/progmodes/f90.el:1.41    Sun Apr 28 18:28:38 2002
--- emacs/lisp/progmodes/f90.el Sun Apr 28 19:36:08 2002
***************
*** 340,347 ****
     ;; 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))
     ;; 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))
--- 340,347 ----
     ;; 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))
     ;; 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,359 ****
        (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))
         ;; 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))
--- 353,359 ----
        (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 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))