[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.58 emacs/lisp/progmodes/f90.el:1.59
*** emacs/lisp/progmodes/f90.el:1.58    Sun Jun 23 11:43:11 2002
--- emacs/lisp/progmodes/f90.el Sat Aug  3 12:54:49 2002
***************
*** 340,350 ****
     ;; 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))
     ;; 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))
     "\\<\\(\\(end[ \t]*\\)?\\(interface\\|block[ \t]*data\\)\\|contains\\)\\>")
    "This does fairly subdued highlighting of comments and function calls.")
--- 340,351 ----
     ;; Special highlighting of "module procedure".
     '("\\<\\(module[ \t]*procedure\\)\\>" (1 font-lock-keyword-face))
     ;; Highlight declaration of derived type.
!    '("\\<\\(\\(?: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\\)\\|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,372 ****
        (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\\)\\>"
        (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))
--- 367,373 ----
        (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\\)[ \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,638 ****
    "Regexp matching the end of a TYPE, INTERFACE, BLOCK DATA section.")
  
  (defconst f90-type-def-re
!   "\\<\\(type\\)[ \t]+\\(\\sw+\\)\\>"
    "Regexp matching the definition of a derived type.")
  
  (defconst f90-no-break-re
--- 633,639 ----
    "Regexp matching the end of a TYPE, INTERFACE, BLOCK DATA section.")
  
  (defconst f90-type-def-re
!   "\\<\\(type\\)\\>[ \t]*\\(?:[^()\n]*::[ \t]*\\)?\\(\\sw+\\)"
    "Regexp matching the definition of a derived type.")
  
  (defconst f90-no-break-re