diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-05-18 23:18:58 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-05-18 23:18:58 -0700 |
| commit | d1f21341e13d897c6aa152b1b454b38e02c09b5c (patch) | |
| tree | 625d1a27f30e2eca27e1b476077f377d320950ab | |
| parent | 4a720484822c3a766dd1775dd659e1a969605457 (diff) | |
| download | emacs-d1f21341e13d897c6aa152b1b454b38e02c09b5c.tar.gz | |
* lisp/progmodes/f90.el (f90-type-def-re): Handle "type, bind(c)". (Bug#8691)
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/progmodes/f90.el | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0548bf9ea28..96d8cf3d83a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2011-05-19 Glenn Morris <rgm@gnu.org> + * progmodes/f90.el (f90-type-def-re): + Handle "type, bind(c)". (Bug#8691) + * emacs-lisp/autoload.el (batch-update-autoloads): Set autoload-excludes by parsing loadup.el rather than Makefiles. diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el index 53aa95498da..e9bb43c4d6d 100644 --- a/lisp/progmodes/f90.el +++ b/lisp/progmodes/f90.el @@ -809,8 +809,10 @@ Can be overridden by the value of `font-lock-maximum-decoration'.") ;; type word ;; type :: word ;; type, stuff :: word + ;; type, bind(c) :: word ;; NOT "type (" - "\\<\\(type\\)\\>\\(?:[^()\n]*::\\)?[ \t]*\\(\\sw+\\)" + "\\<\\(type\\)\\>\\(?:\\(?:[^()\n]*\\|\ +.*,[ \t]*bind[ \t]*([ \t]*c[ \t]*)[ \t]*\\)::\\)?[ \t]*\\(\\sw+\\)" "Regexp matching the definition of a derived type.") (defconst f90-typeis-re |