(f90-type-def-re): Fix value.

(f90-looking-at-type-like): Adapt for new value of `f90-type-def-re'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b68ef14d6aa772dde6df54a2053b9d0d3caf7cc2..2494ce2f57d21b160cc0724cd50c6a0fff94bf04 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-19  Glenn Morris  <gmorris@ast.cam.ac.uk>
+
+       * progmodes/f90.el (f90-type-def-re): Fix value.
+       (f90-looking-at-type-like): Adapt for new `f90-type-def-re' value.
+
 2002-06-18  Juanma Barranquero  <lektu@terra.es>
 
        * filesets.el (filesets-update-pre010505): Fix typo.

diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index cdb7db4688e1c97302399c5d7382926072026c2a..5b34e8506b30a39e10ffaada003512bbe920fe61 100644 (file)
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -632,8 +632,8 @@ 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\\)\\([^(\n]*\\)\\(::\\)?[ \t]*\\b\\(\\sw+\\)"
-  "Regexp matching the declaration of a variable of derived type.")
+  "\\<\\(type\\)[ \t]+\\(\\sw+\\)\\>"
+  "Regexp matching the definition of a derived type.")
 
 (defconst f90-no-break-re
   (regexp-opt '("**" "//" "=>") 'paren)
@@ -977,7 +977,7 @@ NAME is nil if the statement has no label."
 NAME is non-nil only for type."
   (cond
    ((looking-at f90-type-def-re)
-    (list (match-string 1) (match-string 4)))
+    (list (match-string 1) (match-string 2)))
    ((looking-at "\\(interface\\|block[\t]*data\\)\\>")
     (list (match-string 1) nil))))