diff options
| author | Glenn Morris | 2011-06-25 17:01:36 -0700 |
|---|---|---|
| committer | Glenn Morris | 2011-06-25 17:01:36 -0700 |
| commit | ccf7a5d5c8a517e885acf48047b3a7d2dde57248 (patch) | |
| tree | e702cc18c59f067e7dbdd3c71cc236774bd34164 | |
| parent | e9246b20af60e248cb64c48cfabfe71d8955cd84 (diff) | |
| download | emacs-ccf7a5d5c8a517e885acf48047b3a7d2dde57248.tar.gz emacs-ccf7a5d5c8a517e885acf48047b3a7d2dde57248.zip | |
Add some more F2008 font-locking for f90.el.
* lisp/progmodes/f90.el (f90-keywords-re, f90-keywords-level-3-re):
Add some F2008 stuff.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/progmodes/f90.el | 8 |
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 @@ | |||
| 17 | (f90-looking-at-program-block-start, f90-no-block-limit): | 17 | (f90-looking-at-program-block-start, f90-no-block-limit): |
| 18 | Add support for submodules. | 18 | Add support for submodules. |
| 19 | 19 | ||
| 20 | * progmodes/f90.el (f90-keywords-re, f90-procedures-re) | 20 | * progmodes/f90.el (f90-keywords-re, f90-keywords-level-3-re) |
| 21 | (f90-constants-re): Add some F2008 stuff. | 21 | (f90-procedures-re, f90-constants-re): Add some F2008 stuff. |
| 22 | 22 | ||
| 23 | 2011-06-25 Eli Zaretskii <eliz@gnu.org> | 23 | 2011-06-25 Eli Zaretskii <eliz@gnu.org> |
| 24 | 24 | ||
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." | |||
| 311 | "deferred" "enum" "enumerator" "extends" "extends_type_of" | 311 | "deferred" "enum" "enumerator" "extends" "extends_type_of" |
| 312 | "final" "generic" "import" "non_intrinsic" "non_overridable" | 312 | "final" "generic" "import" "non_intrinsic" "non_overridable" |
| 313 | "nopass" "pass" "protected" "same_type_as" "value" "volatile" | 313 | "nopass" "pass" "protected" "same_type_as" "value" "volatile" |
| 314 | ;; F2008 | 314 | ;; F2008. |
| 315 | "contiguous" "submodule" | 315 | "contiguous" "submodule" "concurrent" |
| 316 | ) 'words) | 316 | ) 'words) |
| 317 | "Regexp used by the function `f90-change-keywords'.") | 317 | "Regexp used by the function `f90-change-keywords'.") |
| 318 | 318 | ||
| @@ -330,6 +330,10 @@ The options are 'downcase-word, 'upcase-word, 'capitalize-word and nil." | |||
| 330 | ;; F2003. asynchronous separate. | 330 | ;; F2003. asynchronous separate. |
| 331 | "abstract" "deferred" "import" "final" "non_intrinsic" "non_overridable" | 331 | "abstract" "deferred" "import" "final" "non_intrinsic" "non_overridable" |
| 332 | "nopass" "pass" "protected" "value" "volatile" | 332 | "nopass" "pass" "protected" "value" "volatile" |
| 333 | ;; F2008. | ||
| 334 | ;; "concurrent" is only in the sense of "do [,] concurrent", but given | ||
| 335 | ;; the [,] it's simpler to just do every instance (cf "do while"). | ||
| 336 | "contiguous" "concurrent" | ||
| 333 | ) 'words) | 337 | ) 'words) |
| 334 | "Keyword-regexp for font-lock level >= 3.") | 338 | "Keyword-regexp for font-lock level >= 3.") |
| 335 | 339 | ||