diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-08-26 19:52:37 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-08-26 19:52:37 +0200 |
| commit | e4a3bcf28d92d0bde9ca227ccb40d401038185e5 (patch) | |
| tree | 276387ac4364fdee74b72c2503fc4505e8728043 /runtime/indent/fortran.vim | |
| parent | dd74ab9b464f3d1a5f6f6395469b76f8e0e6dccd (diff) | |
Updated runtime files. Add Scala files.
Diffstat (limited to 'runtime/indent/fortran.vim')
| -rw-r--r-- | runtime/indent/fortran.vim | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/runtime/indent/fortran.vim b/runtime/indent/fortran.vim index e19a19fb1f..be2f0866d5 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.44 -" Last Change: 2016 Jan. 26 +" Version: 0.45 +" Last Change: 2016 Aug. 18 " Maintainer: Ajit J. Thakkar <ajit@unb.ca>; <http://www2.unb.ca/~ajit/> " Usage: For instructions, do :help fortran-indent from Vim " Credits: @@ -121,7 +121,7 @@ function FortranGetIndent(lnum) let prefix='\(\(pure\|impure\|elemental\|recursive\)\s\+\)\{,2}' let type='\(\(integer\|real\|double\s\+precision\|complex\|logical' \.'\|character\|type\|class\)\s*\S*\s\+\)\=' - if prevstat =~? '^\s*\(module\|contains\|program\)\>' + if prevstat =~? '^\s*\(module\|contains\/submodule\|program\)\>' \ ||prevstat =~? '^\s*'.prefix.'subroutine\>' \ ||prevstat =~? '^\s*'.prefix.type.'function\>' \ ||prevstat =~? '^\s*'.type.prefix.'function\>' @@ -129,14 +129,14 @@ function FortranGetIndent(lnum) endif if getline(v:lnum) =~? '^\s*contains\>' \ ||getline(v:lnum)=~? '^\s*end\s*' - \ .'\(function\|subroutine\|module\|program\)\>' + \ .'\(function\|subroutine\|module\/submodule\|program\)\>' let ind = ind - shiftwidth() endif endif "Subtract a shiftwidth from else, else if, elsewhere, case, end if, " end where, end select, end forall, end interface, end associate, - " end enum, and end type statements + " 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\|' \. 'end\s*\(if\|where\|select\|interface\|' |