Remove f90-mode regexp ambiguity (bug#17222)

* lisp/progmodes/f90.el (f90-font-lock-keywords-2):
Modify regexp to be better-behaved.

diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index 342fcb27b3dc0192feb123f78b7d41831a63b28f..dcd74f0369ca852edbcd10782bfd05d02965ccb4 100644 (file)
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -612,7 +612,7 @@ and variable-name parts, respectively."
     '("^[ \t0-9]*\\(?:pure\\|elemental\\)?[ \t]*\
 \\(real\\|integer\\|c\\(haracter\\|omplex\\)\\|\
 enumerator\\|generic\\|procedure\\|logical\\|double[ \t]*precision\\)\
-\\(.*::\\|[ \t]*(.*)\\)?\\(\\(?:[^&!\n]*\\(?:&\n\\)?\\)+\\)"
+\\(.*::\\|[ \t]*(.*)\\)?\\([^&!\n]*\\(?:&\n[^&!\n]*\\)*\\)"
       (1 font-lock-type-face t) (4 font-lock-variable-name-face append))
     ;; Derived type/class variables.
     ;; TODO ? If we just highlighted the "type" part, rather than