2 files changed, 8 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9e661c4cba4..7d59a148873 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -17,8 +17,8 @@
         (f90-looking-at-program-block-start, f90-no-block-limit):
         Add support for submodules.
 
-        * progmodes/f90.el (f90-keywords-re, f90-procedures-re)
-        (f90-constants-re): Add some F2008 stuff.
+        * progmodes/f90.el (f90-keywords-re, f90-keywords-level-3-re)
+        (f90-procedures-re, f90-constants-re): Add some F2008 stuff.
 
 2011-06-25  Eli Zaretskii  <eliz@gnu.org>
 
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index eed87ecef9d..add0820d28b 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -311,8 +311,8 @@ The options are 'downcase-word, 'upcase-word, 'capitalize-word and nil."
                 "deferred" "enum" "enumerator" "extends" "extends_type_of"
                 "final" "generic" "import" "non_intrinsic" "non_overridable"
                 "nopass" "pass" "protected" "same_type_as" "value" "volatile"
-                ;; F2008
-                "contiguous" "submodule"
+                ;; F2008.
+                "contiguous" "submodule" "concurrent"
                 ) 'words)
   "Regexp used by the function `f90-change-keywords'.")
 
@@ -330,6 +330,10 @@ The options are 'downcase-word, 'upcase-word, 'capitalize-word and nil."
      ;; F2003. asynchronous separate.
      "abstract" "deferred" "import" "final" "non_intrinsic" "non_overridable"
      "nopass" "pass" "protected" "value" "volatile"
+     ;; F2008.
+     ;; "concurrent" is only in the sense of "do [,] concurrent", but given
+     ;; the [,] it's simpler to just do every instance (cf "do while").
+     "contiguous" "concurrent"
      ) 'words)
   "Keyword-regexp for font-lock level >= 3.")