changeset 2377:878562053ba3 vim73

Update Fortran indent and syntax file. (Ajit Thakkar)
author Bram Moolenaar <bram@vim.org>
date Thu, 22 Jul 2010 22:30:23 +0200
parents fc58ade2ad7e
children 85b7dc8da5eb
files runtime/doc/autocmd.txt runtime/indent/fortran.vim runtime/syntax/fortran.vim
diffstat 3 files changed, 16 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -1,4 +1,4 @@
-*autocmd.txt*   For Vim version 7.3b.  Last change: 2010 May 14
+*autocmd.txt*   For Vim version 7.3b.  Last change: 2010 Jul 22
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1280,7 +1280,7 @@ and "++ff=" argument that are effective.
 that reads/writes the file.  The |v:cmdbang| variable is one when "!" was
 used, zero otherwise.
 
-See the $VIMRUNTIME/plugin/netrw.vim for examples.
+See the $VIMRUNTIME/plugin/netrwPlugin.vim for examples.
 
 ==============================================================================
 11. Disabling autocommands				*autocmd-disable*
--- a/runtime/indent/fortran.vim
+++ b/runtime/indent/fortran.vim
@@ -1,8 +1,7 @@
 " Vim indent file
 " Language:	Fortran95 (and Fortran90, Fortran77, F and elf90)
-" Version:	0.37
-" URL:		http://www.unb.ca/chem/ajit/indent/fortran.vim
-" Last Change:	2006 Nov 16
+" Version:	0.38
+" Last Change:	2010 July 21
 " Maintainer:	Ajit J. Thakkar <ajit@unb.ca>; <http://www.unb.ca/chem/ajit/>
 " Usage:	Do :help fortran-indent from Vim
 
@@ -32,7 +31,7 @@ if !exists("b:fortran_fixed_source")
     " Detection becomes more accurate and time-consuming if more lines
     " are checked. Increase the limit below if you keep lots of comments at
     " the very top of each file and you have a fast computer
-    let s:lmax = 250
+    let s:lmax = 500
     if ( s:lmax > line("$") )
       let s:lmax = line("$")
     endif
@@ -40,7 +39,7 @@ if !exists("b:fortran_fixed_source")
     let s:ln=1
     while s:ln <= s:lmax
       let s:test = strpart(getline(s:ln),0,5)
-      if s:test[0] !~ '[Cc*!#]' && s:test !~ '^ \+[!#]' && s:test =~ '[^ 0-9\t]'
+      if s:test !~ '^[Cc*]' && s:test !~ '^ *[!#]' && s:test =~ '[^ 0-9\t]' && s:test !~ '^[ 0-9]*\t'
 	let b:fortran_fixed_source = 0
 	break
       endif
--- a/runtime/syntax/fortran.vim
+++ b/runtime/syntax/fortran.vim
@@ -1,7 +1,6 @@
 " Vim syntax file
 " Language:	Fortran95 (and Fortran90, Fortran77, F and elf90)
 " Version:	0.89
-" URL:		http://www.unb.ca/chem/ajit/syntax/fortran.vim
 " Last Change:	2010 July 21
 " Maintainer:	Ajit J. Thakkar (ajit AT unb.ca); <http://www.unb.ca/chem/ajit/>
 " Usage:	For instructions, do :help fortran-syntax from Vim
@@ -70,25 +69,25 @@ if !exists("b:fortran_fixed_source")
   else
     " f90 and f95 allow both fixed and free source form.
     " Assume fixed source form unless signs of free source form
-    " are detected in the first five columns of the first b:lmax lines.
+    " are detected in the first five columns of the first s:lmax lines.
     " Detection becomes more accurate and time-consuming if more lines
     " are checked. Increase the limit below if you keep lots of comments at
     " the very top of each file and you have a fast computer.
-    let b:lmax = 500
-    if ( b:lmax > line("$") )
-      let b:lmax = line("$")
+    let s:lmax = 500
+    if ( s:lmax > line("$") )
+      let s:lmax = line("$")
     endif
     let b:fortran_fixed_source = 1
-    let b:ln=1
-    while b:ln <= b:lmax
-      let b:test = strpart(getline(b:ln),0,5)
-      if b:test !~ '^[Cc*]' && b:test !~ '^ *[!#]' && b:test =~ '[^ 0-9\t]' && b:test !~ '^[ 0-9]*\t'
+    let s:ln=1
+    while s:ln <= s:lmax
+      let s:test = strpart(getline(s:ln),0,5)
+      if s:test !~ '^[Cc*]' && s:test !~ '^ *[!#]' && s:test =~ '[^ 0-9\t]' && s:test !~ '^[ 0-9]*\t'
 	let b:fortran_fixed_source = 0
 	break
       endif
-      let b:ln = b:ln + 1
+      let s:ln = s:ln + 1
     endwhile
-    unlet b:lmax b:ln b:test
+    unlet! s:lmax s:ln s:test
   endif
 endif