vimrc: <SID> is only necessary for mappings.

diff --git a/vimrc b/vimrc
index ccba733d753972c0521019fc8b367f09115cb35c..40e95ba3c9a798419ca7a1753859c1c8c1ff2fe8 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -189,7 +189,7 @@ set formatoptions+=ro
 " started.
 set formatoptions+=l
 " Remove comment leader when joining lines where it makes sense.
-if <SID>HasVersionAndPatch(703, 541)
+if s:HasVersionAndPatch(703, 541)
     set formatoptions+=j
 endif
 
@@ -416,19 +416,19 @@ if has('statusline')
 
     " Short function names to make 'statusline' more readable.
     function! SBC()
-        return <SID>StatuslineBufferCount()
+        return s:StatuslineBufferCount()
     endfunction
     function! SRF()
-        return <SID>StatuslineRelativeFilename()
+        return s:StatuslineRelativeFilename()
     endfunction
     function! SFF()
-        return <SID>StatuslineFileFormat()
+        return s:StatuslineFileFormat()
     endfunction
     function! SFE()
-        return <SID>StatuslineFileEncoding()
+        return s:StatuslineFileEncoding()
     endfunction
     function! SSG()
-        return <SID>StatuslineSyntaxGroup()
+        return s:StatuslineSyntaxGroup()
     endfunction
 
     set statusline=
@@ -771,7 +771,7 @@ if has('syntax')
         if !&diff && exists(':2match')
             " Use ColorColumn for overlong lines if available and my color
             " scheme is used.
-            if &t_Co == 256 && <SID>HasSyntaxGroup('ColorColumn')
+            if &t_Co == 256 && s:HasSyntaxGroup('ColorColumn')
                 2match ColorColumn /\%>78v./
             else
                 2match Todo /\%>78v./
@@ -803,17 +803,17 @@ if has('syntax')
 
 " Special highlight for tabs to reduce their visibility in contrast to other
 " SpecialKey characters (e.g. ^L).
-            if &t_Co == 256 && <SID>HasSyntaxGroup('specialKeyTab')
+            if &t_Co == 256 && s:HasSyntaxGroup('specialKeyTab')
                 call matchadd('specialKeyTab', '\t')
             endif
         endif
     endfunction
 " Enable highlights for the current and all new windows. Thanks to bairui in
 " #vim on Freenode (2012-04-01 00:22 CEST) for the WinEnter suggestion.
-    call <SID>CustomSyntaxHighlights()
+    call s:CustomSyntaxHighlights()
     if has('autocmd')
         augroup vimrc
-            autocmd WinEnter * call <SID>CustomSyntaxHighlights()
+            autocmd WinEnter * call s:CustomSyntaxHighlights()
         augroup END
     endif
 
@@ -970,7 +970,7 @@ if has('autocmd')
 
             echoerr 'Do not edit this file! (Maybe a template file.)'
         endfunction
-        autocmd BufRead * call <SID>SearchForDoNotEditHeader()
+        autocmd BufRead * call s:SearchForDoNotEditHeader()
 
 " AFTER/FTPLUGIN AUTO COMMANDS