From: Glenn Morris <rgm@gnu.org>
Date: Thu, 19 May 2011 06:18:58 +0000 (-0700)
Subject: * lisp/progmodes/f90.el (f90-type-def-re): Handle "type, bind(c)".  (Bug#8691)
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~237^2~10
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d1f21341e13d897c6aa152b1b454b38e02c09b5c;p=emacs.git

* lisp/progmodes/f90.el (f90-type-def-re): Handle "type, bind(c)".  (Bug#8691)
---

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