commit 3ec574f2b549f456f664f689d6da36dc5719aeb9
author Bram Moolenaar <Bram@vim.org> Tue Jun 13 18:12:01 2017 +0200
committer Bram Moolenaar <Bram@vim.org> Tue Jun 13 18:12:01 2017 +0200
tree 8aa7d766ebc0eb3919fdc678e6f48dd0a2b36673
parent 2102035488e80ef6fd5038ed15d21672712ba0f6

Update runtime files.

Includes changing &sw to shiftwidth() for all indent scripts.

runtime/indent/occam.vim

diff --git a/runtime/indent/occam.vim b/runtime/indent/occam.vim
index bebb052..4acd42e 100644
--- a/runtime/indent/occam.vim
+++ b/runtime/indent/occam.vim
@@ -131,7 +131,7 @@
   if line =~ s:FirstLevelIndent || (line =~ s:FirstLevelNonColonEndIndent && line !~ s:ColonEnd)
 	\ || (line !~ s:ColonStart && (prevline =~ s:SecondLevelIndent
 	\ || (prevline =~ s:SecondLevelNonColonEndIndent && prevline !~ s:ColonEnd)))
-    let curindent = curindent + &shiftwidth
+    let curindent = curindent + shiftwidth()
 
     " Restore magic
     if !save_magic|setlocal nomagic|endif
@@ -153,7 +153,7 @@
 
   while !found
 
-    if indent(prevlinenum) == curindent - &shiftwidth
+    if indent(prevlinenum) == curindent - shiftwidth()
       let found = 1
     endif
 
@@ -171,7 +171,7 @@
 
   if prevlinenum > 0
     if getline(prevlinenum) =~ s:SecondLevelIndent
-      let curindent = curindent + &shiftwidth
+      let curindent = curindent + shiftwidth()
     endif
   endif