diff --git a/vimfiles.stefan/compiler/gcc.vim b/vimfiles.stefan/compiler/gcc.vim
index 806347c..09bc849 100644
--- a/vimfiles.stefan/compiler/gcc.vim
+++ b/vimfiles.stefan/compiler/gcc.vim
@@ -19,24 +19,24 @@ execute('source ' . $VIMRUNTIME . '/compiler/gcc.vim')
 " -------
 " PC-Lint
 " -------
-"setlocal errorformat+=\"%f\"\\,\ line\ %l:\ %t%.%#\ \(pclint:%n\):%m
-"setlocal errorformat+=%t%.%#\ \(pclint:%n\):%m
+"set errorformat+=\"%f\"\\,\ line\ %l:\ %t%.%#\ \(pclint:%n\):%m
+"set errorformat+=%t%.%#\ \(pclint:%n\):%m
 " -------
 " SP-Lint
 " -------
-setlocal errorformat+=%A%f\(%l\):\ %m
-setlocal errorformat+=%A%f\(%l\):
-setlocal errorformat+=%A%f\(%l\\,%c\):\ %m
-setlocal errorformat+=%A%f\(%l\\,%c\):
-setlocal errorformat+=%C\ \ \ \ %m
+set errorformat+=%A%f\(%l\):\ %m
+set errorformat+=%A%f\(%l\):
+set errorformat+=%A%f\(%l\\,%c\):\ %m
+set errorformat+=%A%f\(%l\\,%c\):
+set errorformat+=%C\ \ \ \ %m
 
 " -----
 " Tools
 " -----
-setlocal errorformat+=%+G%.%#.exe:\ %m
-setlocal errorformat+=%+G%.%#.exe[%*\\d]:\ ***\ %m
+set errorformat+=%+G%.%#.exe:\ %m
+set errorformat+=%+G%.%#.exe[%*\\d]:\ ***\ %m
 
 " Error format from other programs: ...: ...
-"setlocal errorformat+=%+G%f:\ %m
+"set errorformat+=%+G%f:\ %m
 
 let current_compiler = 'gcc-special'
diff --git a/vimfiles.stefan/compiler/java.vim b/vimfiles.stefan/compiler/java.vim
index 044b62e..cbefa55 100644
--- a/vimfiles.stefan/compiler/java.vim
+++ b/vimfiles.stefan/compiler/java.vim
@@ -6,7 +6,7 @@ let current_compiler = "java"
 
 
 "let &makeprg = "/usr/java/current/bin/javac %:p"
-"setlocal shellpipe=2>
+"set shellpipe=2>
 
 "set errorformat+=%E%\\s%#File\ \"%f\"\\,\ line\ %l\\,\ %m
 "set errorformat+=%C%m
diff --git a/vimfiles.stefan/compiler/pascal.vim b/vimfiles.stefan/compiler/pascal.vim
index e2fa9b8..7579863 100644
--- a/vimfiles.stefan/compiler/pascal.vim
+++ b/vimfiles.stefan/compiler/pascal.vim
@@ -10,7 +10,7 @@ let current_compiler = "pascal"
 
 
 "let &makeprg = "\\tools\\python\\v2.1a2\\python %:p"
-"setlocal shellpipe=2>
+"set shellpipe=2>
 
 "set errorformat+=%E%\\s%#File\ \"%f\"\\,\ line\ %l\\,\ %m
 "set errorformat+=%C%m
diff --git a/vimfiles.stefan/compiler/python.vim b/vimfiles.stefan/compiler/python.vim
index 9b59816..edccb6e 100644
--- a/vimfiles.stefan/compiler/python.vim
+++ b/vimfiles.stefan/compiler/python.vim
@@ -14,7 +14,7 @@ let current_compiler = "python"
 set makeprg=python\ -c\ \"import\ py_compile;\ py_compile.compile('%')\"
 "let &makeprg = g:python . ' -c "print \"hallo welt\"; print \"ende\""'
 
-setlocal shellpipe=2>
+set shellpipe=2>
 
 set errorformat+=%E%\\s%#File\ \"%f\"\\,\ line\ %l\\,\ %m
 set errorformat+=%C%m
diff --git a/vimfiles.stefan/compiler/python22.vim b/vimfiles.stefan/compiler/python22.vim
index fbd1b36..64209c2 100644
--- a/vimfiles.stefan/compiler/python22.vim
+++ b/vimfiles.stefan/compiler/python22.vim
@@ -11,8 +11,8 @@ let current_compiler = 'python'
 
 
 let &makeprg = 'python %:p'
-"setlocal shellpipe=>
-setlocal shellpipe=2>
+"set shellpipe=>
+set shellpipe=2>
 "let &shellpipe = '|' PathNormpath('e:/tools/gnu/shutils/bin/tee.exe')
 "let &shellpipe = '|' PathNormpath('e:/tools/gnu/shutils/bin/tee.exe')
 "            \ PathNormpath(make_log) '|' PathNormpath('e:/tools/gnu/shutils/bin/tee.exe')
diff --git a/vimfiles.stefan/ftdetect/a2l.vim b/vimfiles.stefan/ftdetect/a2l.vim
index 75d8719..7b0d18c 100644
--- a/vimfiles.stefan/ftdetect/a2l.vim
+++ b/vimfiles.stefan/ftdetect/a2l.vim
@@ -1,2 +1,2 @@
-autocmd BufRead,BufNewFile *.a2l set filetype=a2l
-autocmd BufRead,BufNewFile *.x2l set filetype=a2l
+autocmd BufRead,BufNewFile *.a2l setlocal filetype=a2l
+autocmd BufRead,BufNewFile *.x2l setlocal filetype=a2l
diff --git a/vimfiles.stefan/ftdetect/c.vim b/vimfiles.stefan/ftdetect/c.vim
index d553607..7a2033c 100644
--- a/vimfiles.stefan/ftdetect/c.vim
+++ b/vimfiles.stefan/ftdetect/c.vim
@@ -1,6 +1,6 @@
-autocmd BufRead,BufNewFile /usr/include/*/*   set filetype=c
-autocmd BufRead,BufNewFile *.d   set filetype=c
-autocmd BufRead,BufNewFile *.dat set filetype=c
-autocmd BufRead,BufNewFile *.i   set filetype=c
-autocmd BufRead,BufNewFile *.h.merge*   set filetype=c
-autocmd BufRead,BufNewFile *.c.merge*   set filetype=c
+autocmd BufRead,BufNewFile /usr/include/*/*   setlocal filetype=c
+autocmd BufRead,BufNewFile *.d   setlocal filetype=c
+autocmd BufRead,BufNewFile *.dat setlocal filetype=c
+autocmd BufRead,BufNewFile *.i   setlocal filetype=c
+autocmd BufRead,BufNewFile *.h.merge*   setlocal filetype=c
+autocmd BufRead,BufNewFile *.c.merge*   setlocal filetype=c
diff --git a/vimfiles.stefan/ftdetect/paf.vim b/vimfiles.stefan/ftdetect/paf.vim
index 340ab9f..54f751a 100644
--- a/vimfiles.stefan/ftdetect/paf.vim
+++ b/vimfiles.stefan/ftdetect/paf.vim
@@ -1,4 +1,4 @@
-autocmd BufRead,BufNewFile *.paf set filetype=paf
-autocmd BufRead,BufNewFile *.daf set filetype=paf
-autocmd BufRead,BufNewFile *.0pa set filetype=paf
-autocmd BufRead,BufNewFile *.0da set filetype=paf
+autocmd BufRead,BufNewFile *.paf setlocal filetype=paf
+autocmd BufRead,BufNewFile *.daf setlocal filetype=paf
+autocmd BufRead,BufNewFile *.0pa setlocal filetype=paf
+autocmd BufRead,BufNewFile *.0da setlocal filetype=paf
diff --git a/vimfiles.stefan/ftdetect/scons.vim b/vimfiles.stefan/ftdetect/scons.vim
index 7afb970..e585be0 100644
--- a/vimfiles.stefan/ftdetect/scons.vim
+++ b/vimfiles.stefan/ftdetect/scons.vim
@@ -1,3 +1,3 @@
-autocmd BufRead,BufNewFile   SConstruct  set filetype=scons
-autocmd BufRead,BufNewFile   SConscript  set filetype=scons
-autocmd BufRead,BufNewFile *.SConscript  set filetype=scons
+autocmd BufRead,BufNewFile   SConstruct  setlocal filetype=scons
+autocmd BufRead,BufNewFile   SConscript  setlocal filetype=scons
+autocmd BufRead,BufNewFile *.SConscript  setlocal filetype=scons
diff --git a/vimfiles.stefan/ftdetect/tex.vim b/vimfiles.stefan/ftdetect/tex.vim
index 488bd30..ed9c451 100644
--- a/vimfiles.stefan/ftdetect/tex.vim
+++ b/vimfiles.stefan/ftdetect/tex.vim
@@ -1 +1 @@
-autocmd BufRead,BufNewFile *.tex  set filetype=tex
+autocmd BufRead,BufNewFile *.tex  setlocal filetype=tex
diff --git a/vimfiles.stefan/ftdetect/trace.vim b/vimfiles.stefan/ftdetect/trace.vim
index ae38fcf..fd73775 100644
--- a/vimfiles.stefan/ftdetect/trace.vim
+++ b/vimfiles.stefan/ftdetect/trace.vim
@@ -1 +1 @@
-autocmd BufRead,BufNewFile *.cmm set filetype=trace
+autocmd BufRead,BufNewFile *.cmm setlocal filetype=trace
diff --git a/vimfiles.stefan/ftdetect/uc.vim b/vimfiles.stefan/ftdetect/uc.vim
index 3d3679d..b812f9d 100644
--- a/vimfiles.stefan/ftdetect/uc.vim
+++ b/vimfiles.stefan/ftdetect/uc.vim
@@ -1 +1 @@
-autocmd BufRead,BufNewFile *.uc  set filetype=uc
+autocmd BufRead,BufNewFile *.uc  setlocal filetype=uc
diff --git a/vimfiles.stefan/ftplugin/c.vim b/vimfiles.stefan/ftplugin/c.vim
index 9d9decb..6aaa4e8 100644
--- a/vimfiles.stefan/ftplugin/c.vim
+++ b/vimfiles.stefan/ftplugin/c.vim
@@ -12,14 +12,14 @@ let &l:tabstop = s:tabwidth
 " spaces for tabs
 "let &softtabstop = s:tabwidth
 " smart indent tabs (use spaces for indent else tabs)
-"set smarttab
+"setlocal smarttab
 " use spaces for tabs
 setlocal expandtab
 
 " autoindent
 " indent mode - one of autoindent, smartindent or cindent
-" set autoindent
-" set smartindent
+" setlocal autoindent
+" setlocal smartindent
 setlocal cindent
 setlocal cinoptions=*200,)100,(s,w1,W4
 let &l:shiftwidth = s:tabwidth
diff --git a/vimfiles.stefan/ftplugin/hex.vim b/vimfiles.stefan/ftplugin/hex.vim
index 7bc3bd2..f441012 100644
--- a/vimfiles.stefan/ftplugin/hex.vim
+++ b/vimfiles.stefan/ftplugin/hex.vim
@@ -193,9 +193,9 @@ endfunction
 "    echo HexStatusLine()
 "endfunction
 
-command! HexStatusLine set statusline=%!HexStatusLine()
-command! HexStatusLineOff set statusline=
+command! HexStatusLine setlocal statusline=%!HexStatusLine()
+command! HexStatusLineOff setlocal statusline=
 " Always update statusline with HEX info
-set statusline=%!HexStatusLine()
+setlocal statusline=%!HexStatusLine()
 " Always show statusline
-set laststatus=2
+setlocal laststatus=2
diff --git a/vimfiles.stefan/ftplugin/java.vim b/vimfiles.stefan/ftplugin/java.vim
index f691ae5..99fcfab 100644
--- a/vimfiles.stefan/ftplugin/java.vim
+++ b/vimfiles.stefan/ftplugin/java.vim
@@ -5,7 +5,7 @@ setlocal shiftwidth=2
 setlocal expandtab
 setlocal tabstop=8
 
-"set autoindent
+"setlocal autoindent
 
 compiler java
 
diff --git a/vimfiles.stefan/ftplugin/tex.vim b/vimfiles.stefan/ftplugin/tex.vim
index 542a466..121b8d6 100644
--- a/vimfiles.stefan/ftplugin/tex.vim
+++ b/vimfiles.stefan/ftplugin/tex.vim
@@ -1,7 +1,7 @@
 " Stefans vim-file plugin
 
 " Add Menu-Bar
-set guioptions+=m
+setlocal guioptions+=m
 
 " benutze Makefile
 let g:Tex_UseMakefile = 1
diff --git a/vimfiles.stefan/plugin/cvs.vim b/vimfiles.stefan/plugin/cvs.vim
index 22ae142..f697ae6 100644
--- a/vimfiles.stefan/plugin/cvs.vim
+++ b/vimfiles.stefan/plugin/cvs.vim
@@ -70,7 +70,7 @@ function s:CVSshowDifferences(filename)
 	let patchfile = tempname()
 	echo 'patchfile: ' . patchfile
 	call s:CVSdiff(a:filename, patchfile)
-	set patchexpr=ReversePatch()
+	setlocal patchexpr=ReversePatch()
 	execute 'vertical diffpatch ' . patchfile
 endfunction
 
diff --git a/vimfiles.stefan/plugin/vimsuite.vim b/vimfiles.stefan/plugin/vimsuite.vim
index b40ecbf..9fe32c1 100644
--- a/vimfiles.stefan/plugin/vimsuite.vim
+++ b/vimfiles.stefan/plugin/vimsuite.vim
@@ -922,10 +922,10 @@ endfunction
 
 command DiffOff call DiffOff()
 function DiffOff()
-    set nodiff
-    set noscrollbind
-    set foldcolumn=0
-    set foldmethod=syntax
+    setlocal nodiff
+    setlocal noscrollbind
+    setlocal foldcolumn=0
+    setlocal foldmethod=syntax
 endfunction
 
 " options for DirDiff
diff --git a/vimfiles.stefan/syntax/c.vim b/vimfiles.stefan/syntax/c.vim
index 23b719b..b04fd11 100644
--- a/vimfiles.stefan/syntax/c.vim
+++ b/vimfiles.stefan/syntax/c.vim
@@ -26,8 +26,8 @@ syntax region myFold start="{" end="}" transparent fold
 syntax region if0Fold start="^\s*#\s*if\s\+0\+\>" end="^\s*#\s*endif" fold containedin=cPreCondit
 let c_no_if0 = 1
 syntax sync fromstart
-"set foldmethod=syntax
-"set nofoldenable
+"setlocal foldmethod=syntax
+"setlocal nofoldenable
 
 " Folds for #ifdef
 command! -nargs=0 FoldDefine call FoldDefine(<args>)
@@ -49,7 +49,7 @@ function! FoldDefine ()
     execute command
     execute 'highlight def link ' . foldname . ' Comment'
     syntax sync fromstart
-    set foldmethod=syntax
+    setlocal foldmethod=syntax
     execute 'normal `x'
 endfunction
 
diff --git a/vimfiles.stefan/syntax/java.vim b/vimfiles.stefan/syntax/java.vim
index baed75d..30ac049 100644
--- a/vimfiles.stefan/syntax/java.vim
+++ b/vimfiles.stefan/syntax/java.vim
@@ -1,4 +1,4 @@
 syntax region myFold start="{" end="}" transparent fold
 syntax sync fromstart
-set foldmethod=syntax
+setlocal foldmethod=syntax