* progmodes/f90.el (f90-font-lock-keywords-2): Fix `enum'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b6627e69ccc80e18f7db4606183ef6b1bc2619b2..77196ad4842ce0fe6e887cb0d7cb2f2c9dedf22c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-05  Glenn Morris  <rgm@gnu.org>
+
+       * progmodes/f90.el (f90-font-lock-keywords-2): Fix `enum'.
+
 2010-02-05  Chong Yidong  <cyd@stupidchicken.com>
 
        * startup.el (command-line-1): Convert options beginning with a

diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index 8f95da7046482d28c6428e5e63208fc5f2d64a7d..eda9f4e01557a33a240fb069b6fdc7231467e492 100644 (file)
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -558,9 +558,8 @@ logical\\|double[ \t]*precision\\|\
 \\(function\\)\\>[ \t]*\\(\\sw+\\)[ \t]*\\(([^&!\n]*)\\)"
       (1 font-lock-type-face t) (4 font-lock-keyword-face t)
       (5 font-lock-function-name-face t) (6 'default t))
-    ;; enum (F2003; cf type in -1).
-    '("\\<\\(enum\\)\\>\\([^()\n]*::\\)?[ \t]*\\(\\sw+\\)"
-      (1 font-lock-keyword-face) (3 font-lock-function-name-face))
+    ;; enum (F2003; must be followed by ", bind(C)").
+    '("\\<\\(enum\\)[ \t]*," (1 font-lock-keyword-face))
     ;; end do, enum (F2003), if, select, where, and forall constructs.
     '("\\<\\(end[ \t]*\\(do\\|if\\|enum\\|select\\|forall\\|where\\)\\)\\>\
 \\([ \t]+\\(\\sw+\\)\\)?"