vim: fork vim-lastplace for suda support

[dotfiles.git] / etc / vim / .vimrc

diff --git a/etc/vim/.vimrc b/etc/vim/.vimrc
index 6ad6135c2e2c3b31a228038e093b91ba970a8479..aca1f42617131c7acdcb58f0b7b22ca0590584f5 100644 (file)
--- a/etc/vim/.vimrc
+++ b/etc/vim/.vimrc
@@ -48,6 +48,7 @@ endif
 unlet x
 unlet y
 
+
 """ vim-only defaults
 if !has('nvim')
     " neovim defaults are already set
@@ -57,15 +58,51 @@ if !has('nvim')
     autocmd! vimStartup
 
     " packages
-    packadd! matchit
-    packadd! editorconfig   " this is now built to [n]vim in but optional
-    packadd! vim-commentary " nvim has built in commenting now
+    packadd! matchit        " included with [n]vim but disabled by default
+    packadd! editorconfig   " now included with [n]vim but disabled by default
+    packadd! vim-commentary " nvim has this built in now, vim still needs it
 
     " options
     set hlsearch
     autocmd BufRead * set autoindent
 endif
 
+
+""" package config
+"" suda
+" https://github.com/lambdalisue/vim-suda/issues/32#issuecomment-829608925
+if ! &diff
+    let g:suda_smart_edit = 1
+endif
+" re-enable backup, swap, undo for suda buffers that we can read
+" https://github.com/lambdalisue/vim-suda/issues/25
+function s:SudaSettingsSave()
+    let l:f = expand('<afile>')
+    if stridx(l:f, 'suda://') == 0
+        let g:sev_suda_file = expand('<afile>')
+        let g:sev_suda_backup = &backup
+        let g:sev_suda_swapfile = &swapfile
+        let g:sev_suda_undofile = &undofile
+    endif
+endfunction
+function s:SudaSettingsRestore()
+    if exists('g:sev_suda_file') && filereadable(g:sev_suda_file)
+        if exists('g:sev_suda_backup') && g:sev_suda_backup
+            " XXX: suda.vim uses setlocal for this, even though it's global...
+            setlocal backup
+        endif
+        if exists('g:sev_suda_swapfile') && g:sev_suda_swapfile
+            setlocal swapfile
+        endif
+        if exists('g:sev_suda_undofile') && g:sev_suda_undofile
+            setlocal undofile
+        endif
+    endif
+endfunction
+autocmd BufReadPre * call s:SudaSettingsSave()
+autocmd BufReadPost suda://* call s:SudaSettingsRestore()
+
+
 """ styling
 " nice default theme
 colorscheme murphy
@@ -77,10 +114,10 @@ autocmd VimEnter,WinNew * set cursorline
 
 " unique highlighting for leading spaces and in-line spaces
 " NOTE: this leaves tabs and other special whitespace untouched intentionally
-autocmd VimEnter,ColorScheme * highlight Space ctermfg=Grey guifg=#686868
-autocmd VimEnter,ColorScheme * highlight link SpaceLeading NonText
-autocmd VimEnter,WinNew * match Space / /
-autocmd VimEnter,WinNew * 2match SpaceLeading /\(^ \+\)\|\( \+$\)/
+autocmd VimEnter,ColorScheme * highlight SpaceInner ctermfg=Grey guifg=#686868
+autocmd VimEnter,ColorScheme * highlight link SpaceOuter NonText
+autocmd VimEnter,WinNew * match SpaceInner / /
+autocmd VimEnter,WinNew * 2match SpaceOuter /\(^ \+\)\|\( \+$\)/
 
 " always show statusline
 set laststatus=2
@@ -113,9 +150,16 @@ autocmd VimEnter,WinNew,
 autocmd VimEnter,WinNew * set list
 set listchars=tab:├─,extends:»,precedes:«,space:·,trail:∙,nbsp:■
 
+
 """ editor
 " always save undo file for all file buffers
-autocmd BufRead * set undofile
+autocmd BufReadPre * setlocal undofile
+
+
+" explicitly use modeline, even on systems where it's disabled by system vimrc
+autocmd BufRead * set modeline
+" should be default disabled but just in case
+set nomodelineexpr
 
 "" indent
 " always use shiftwidth instead of tabsize
@@ -129,7 +173,7 @@ autocmd FileType html       set softtabstop=2 shiftwidth=2 expandtab
 let g:EditorConfig_enable_for_new_buf = 1
 
 "" syntax
-autocmd FileType todo       set colorcolumn=0
+autocmd Syntax php          syn clear phpHereDoc phpNowDoc
 
 "" mappings
 " use more accessible escapes, as C-n and C-o are shadowed by some terminals