From: Glenn Morris <rgm@gnu.org>
Date: Wed, 19 Jun 2002 22:41:53 +0000 (+0000)
Subject: (f90-type-def-re): Fix value.
X-Git-Tag: ttn-vms-21-2-B4~14538
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e7272eceaa64c62ab8b51fcde116b9be9c71bf83;p=emacs.git

(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 b68ef14d6aa..2494ce2f57d 100644
--- 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 cdb7db4688e..5b34e8506b3 100644
--- 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))))