[Emacs-diffs] /srv/bzr/emacs/trunk r99453: * progmodes/f90.el (f90-font-lock-keywords-2): Fix `enum'.

[Glenn Morris]

------------------------------------------------------------
revno: 99453
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2010-02-05 00:12:08 -0800
message:
  * progmodes/f90.el (f90-font-lock-keywords-2): Fix `enum'.
modified:
  lisp/ChangeLog
  lisp/progmodes/f90.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-02-05 04:49:36 +0000
+++ b/lisp/ChangeLog    2010-02-05 08:12:08 +0000
@@ -1,3 +1,7 @@
+2010-02-05  Glenn Morris  <address@hidden>
+
+       * progmodes/f90.el (f90-font-lock-keywords-2): Fix `enum'.
+
 2010-02-05  Chong Yidong  <address@hidden>
 
        * startup.el (command-line-1): Convert options beginning with a

=== modified file 'lisp/progmodes/f90.el'
--- a/lisp/progmodes/f90.el     2010-01-13 08:35:10 +0000
+++ b/lisp/progmodes/f90.el     2010-02-05 08:12:08 +0000
@@ -558,9 +558,8 @@
 \\(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+\\)\\)?"