diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2017-05-01 15:18:34 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-01 15:18:34 +0200 |
commit | a2c2fa68c1077be0a6f026f7cb1aeedeee47e39b (patch) | |
tree | 0d394eace71c9339cc5de16c419fcc39bb0adcad /runtime/indent/fortran.vim | |
parent | 5d73a6e5dfbd1a7ce27888e7a7ac1c402da9dfc8 (diff) | |
parent | fa1ee0ac73ab0fbbd246783f42e2df2c2d9280d6 (diff) | |
download | rneovim-a2c2fa68c1077be0a6f026f7cb1aeedeee47e39b.tar.gz rneovim-a2c2fa68c1077be0a6f026f7cb1aeedeee47e39b.tar.bz2 rneovim-a2c2fa68c1077be0a6f026f7cb1aeedeee47e39b.zip |
Merge #6625 from justinmk/vim-runtime
Diffstat (limited to 'runtime/indent/fortran.vim')
-rw-r--r-- | runtime/indent/fortran.vim | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/runtime/indent/fortran.vim b/runtime/indent/fortran.vim index c9bee78a6e..2ba69e86df 100644 --- a/runtime/indent/fortran.vim +++ b/runtime/indent/fortran.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: Fortran 2008 (and older: Fortran 2003, 95, 90, and 77) -" Version: 0.46 -" Last Change: 2016 Sep. 27 +" Version: 47 +" Last Change: 2016 Oct. 29 " Maintainer: Ajit J. Thakkar <ajit@unb.ca>; <http://www2.unb.ca/~ajit/> " Usage: For instructions, do :help fortran-indent from Vim " Credits: @@ -100,9 +100,9 @@ function FortranGetIndent(lnum) endif endif - "Add a shiftwidth to statements following if, else, else if, case, + "Add a shiftwidth to statements following if, else, else if, case, class, "where, else where, forall, type, interface and associate statements - if prevstat =~? '^\s*\(case\|else\|else\s*if\|else\s*where\)\>' + if prevstat =~? '^\s*\(case\|class\|else\|else\s*if\|else\s*where\)\>' \ ||prevstat=~? '^\s*\(type\|interface\|associate\|enum\)\>' \ ||prevstat=~?'^\s*\(\d\+\s\)\=\s*\(\a\w*\s*:\)\=\s*\(forall\|where\|block\)\>' \ ||prevstat=~? '^\s*\(\d\+\s\)\=\s*\(\a\w*\s*:\)\=\s*if\>' @@ -136,11 +136,11 @@ function FortranGetIndent(lnum) endif endif - "Subtract a shiftwidth from else, else if, elsewhere, case, end if, + "Subtract a shiftwidth from else, else if, elsewhere, case, class, end if, " end where, end select, end forall, end interface, end associate, " end enum, end type, end block and end type statements if getline(v:lnum) =~? '^\s*\(\d\+\s\)\=\s*' - \. '\(else\|else\s*if\|else\s*where\|case\|' + \. '\(else\|else\s*if\|else\s*where\|case\|class\|' \. 'end\s*\(if\|where\|select\|interface\|' \. 'type\|forall\|associate\|enum\|block\)\)\>' let ind = ind - shiftwidth() |