vim: update vim-suda and supporting framework

- vim-suda was updated to remove `setlocal backup`, so the rc no longer handles
  that option. (#85)
- didn't notice at the time but even if undofile is set during :read or enabled
  after, the buffer's undo stack is not updated, so expand the undofile save to
  also read the undofile when loading suda:// buffers.

diff --git a/etc/vim/.vimrc b/etc/vim/.vimrc
index 5e027bda1fbf56ee4ae4ec1407e74a1806030a4d..0b9bcd9dc0739d766fbe7558209fa847134d13ea 100644 (file)
--- a/etc/vim/.vimrc
+++ b/etc/vim/.vimrc
@@ -184,26 +184,31 @@ endif
 " re-enable backup, swap, undo for suda buffers that we can read
 " https://github.com/lambdalisue/vim-suda/issues/25
 function s:SudaSettingsSave()
 " re-enable backup, swap, undo for suda buffers that we can read
 " https://github.com/lambdalisue/vim-suda/issues/25
 function s:SudaSettingsSave()

-    let b:sev_suda_backup = &backup

     let b:sev_suda_swapfile = &swapfile
     let b:sev_suda_undofile = &undofile
     let b:sev_suda_swapfile = &swapfile
     let b:sev_suda_undofile = &undofile

+    " fix https://github.com/lambdalisue/vim-suda/issues/87
+    setlocal noswapfile

 endfunction
 function s:SudaSettingsRestore()
     if filereadable(expand('<afile>')[7:])
 endfunction
 function s:SudaSettingsRestore()
     if filereadable(expand('<afile>')[7:])

-        if exists('b:sev_suda_backup') && b:sev_suda_backup
-            " XXX: suda.vim uses setlocal for this, even though it's global...
-            "      https://github.com/lambdalisue/vim-suda/issues/85
-            setlocal backup
-        endif

         if exists('b:sev_suda_swapfile') && b:sev_suda_swapfile
         if exists('b:sev_suda_swapfile') && b:sev_suda_swapfile

-            setlocal swapfile
+            try
+                setlocal swapfile
+            catch
+                " ignore swapfile errors, they should have been shown already
+                echohl ErrorMsg
+                for line in split(v:exception, '\n')
+                    echomsg printf('[suda] %s', line)
+                endfor
+                echohl None
+            endtry

         endif
         if exists('b:sev_suda_undofile') && b:sev_suda_undofile
             setlocal undofile
         endif
     endif
 endfunction
         endif
         if exists('b:sev_suda_undofile') && b:sev_suda_undofile
             setlocal undofile
         endif
     endif
 endfunction

-function s:SudaWriteUndo()
+function s:SudaProcessUndo(cmd)

     let p = expand('<afile>')[7:]
     if has('win32') || !&undofile || !filereadable(p)
         return
     let p = expand('<afile>')[7:]
     if has('win32') || !&undofile || !filereadable(p)
         return


@@ -252,7 +257,7 @@ function s:SudaWriteUndo()
             continue
         endif
         try
             continue
         endif
         try

-            execute printf('wundo! %s/%s', fnameescape(d), fnameescape(f))
+            execute printf('%s %s/%s', a:cmd, fnameescape(d), fnameescape(f))

             break
         catch
             continue
             break
         catch
             continue


@@ -261,4 +266,5 @@ function s:SudaWriteUndo()
 endfunction
 autocmd BufReadPre suda://* call s:SudaSettingsSave()
 autocmd BufReadPost suda://* call s:SudaSettingsRestore()
 endfunction
 autocmd BufReadPre suda://* call s:SudaSettingsSave()
 autocmd BufReadPost suda://* call s:SudaSettingsRestore()

-autocmd BufWritePost suda://* call s:SudaWriteUndo()
+autocmd BufReadPost suda://* call s:SudaProcessUndo('silent! rundo')
+autocmd BufWritePost suda://* call s:SudaProcessUndo('wundo!')

diff --git a/etc/vim/pack/vim-suda/start/vim-suda b/etc/vim/pack/vim-suda/start/vim-suda
index b97fab52f9cdeabe2bbb5eb98d82356899f30829..e333169211b84d6f4012ac9e40bcbbf370b74289 160000 (submodule)
--- a/etc/vim/pack/vim-suda/start/vim-suda
+++ b/etc/vim/pack/vim-suda/start/vim-suda
@@ -1 +1 @@
-Subproject commit b97fab52f9cdeabe2bbb5eb98d82356899f30829
+Subproject commit e333169211b84d6f4012ac9e40bcbbf370b74289