diff options
| author | Kenichi Handa | 2011-05-20 09:54:09 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2011-05-20 09:54:09 +0900 |
| commit | e23640bb698b291866717eef3e6b4c444b3fc26a (patch) | |
| tree | a02126245311ef8f18c43ba9400314fdb7e1d54b /lisp/progmodes | |
| parent | 31bfc35cca6df0d14f4786a9890f3a01b91cfc4c (diff) | |
| parent | 35fd0881e61b873ae8c7e4dd9b723d5dd2b578c9 (diff) | |
| download | emacs-e23640bb698b291866717eef3e6b4c444b3fc26a.tar.gz emacs-e23640bb698b291866717eef3e6b4c444b3fc26a.zip | |
merge trunk
Diffstat (limited to 'lisp/progmodes')
| -rw-r--r-- | lisp/progmodes/f90.el | 4 |
1 files changed, 3 insertions, 1 deletions
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'.") | |||
| 809 | ;; type word | 809 | ;; type word |
| 810 | ;; type :: word | 810 | ;; type :: word |
| 811 | ;; type, stuff :: word | 811 | ;; type, stuff :: word |
| 812 | ;; type, bind(c) :: word | ||
| 812 | ;; NOT "type (" | 813 | ;; NOT "type (" |
| 813 | "\\<\\(type\\)\\>\\(?:[^()\n]*::\\)?[ \t]*\\(\\sw+\\)" | 814 | "\\<\\(type\\)\\>\\(?:\\(?:[^()\n]*\\|\ |
| 815 | .*,[ \t]*bind[ \t]*([ \t]*c[ \t]*)[ \t]*\\)::\\)?[ \t]*\\(\\sw+\\)" | ||
| 814 | "Regexp matching the definition of a derived type.") | 816 | "Regexp matching the definition of a derived type.") |
| 815 | 817 | ||
| 816 | (defconst f90-typeis-re | 818 | (defconst f90-typeis-re |