(f90-typedef-matcher, f90-looking-at-type-like): Check that

end-of-word follows "type".

2 files changed, 7 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index adef3a31bfb..289c3801b27 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-03  Glenn Morris  <rgm@gnu.org>
+
+        * progmodes/f90.el (f90-typedef-matcher, f90-looking-at-type-like):
+        Check that end-of-word follows "type".
+
 2008-06-02  Daiki Ueno  <ueno@unixuser.org>
 
         * epa-file.el (epa-file-write-region): Write the entire buffer
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index 3cceaecc268..ce3237cdffb 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -440,7 +440,7 @@ The options are 'downcase-word, 'upcase-word, 'capitalize-word and nil."
 Set the match data so that subexpression 1,2 are the TYPE, and
 type-name parts, respectively."
   (let (found l)
-    (while (and (re-search-forward "\\<\\(\\(?:end[ \t]*\\)?type\\)[ \t]*"
+    (while (and (re-search-forward "\\<\\(\\(?:end[ \t]*\\)?type\\)\\>[ \t]*"
                                    limit t)
                 (not (setq found
                            (progn
@@ -1213,7 +1213,7 @@ NAME is nil if the statement has no label."
 NAME is non-nil only for type."
   (cond
    ((save-excursion
-      (and (looking-at "\\<type[ \t]*")
+      (and (looking-at "\\<type\\>[ \t]*")
            (goto-char (match-end 0))
            (not (looking-at "\\(is\\>\\|(\\)"))
            (or (looking-at "\\(\\sw+\\)")