X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.vimrc;h=849d8acd34511f7a10604cfca00b14f8f13e12d6;hb=334d38cccd615842e2ec3a93da6cd56a2b561e8e;hp=b25ff63f9d891c1088edfe5d6110d9e1c475dea6;hpb=cf1fcbf3b80158230383b27776ca768899b3a52b;p=dotfiles.git

diff --git a/.vimrc b/.vimrc
index b25ff63..849d8ac 100644
--- a/.vimrc
+++ b/.vimrc
@@ -279,29 +279,24 @@ else
       endif
    endif
 
-   " Automatically set paste mode in Vim when pasting in bracketed paste mode
-   " https://coderwall.com/p/if9mda/automatically-set-paste-mode-in-vim-when-pasting-in-insert-mode
-   function! WrapForTmux(s)
-     if !exists('$TMUX')
-       return a:s
-     endif
+   " Bracketed paste mode
+   " https://github.com/ConradIrwin/vim-bracketed-paste/blob/master/plugin/bracketed-paste.vim
+   let &t_ti .= "\<Esc>[?2004h"
+   let &t_te = "\e[?2004l" . &t_te
 
-     let tmux_start = "\<Esc>Ptmux;"
-     let tmux_end = "\<Esc>\\"
-
-     return tmux_start . substitute(a:s, "\<Esc>", "\<Esc>\<Esc>", 'g') . tmux_end
-   endfunction
-
-   let &t_SI .= WrapForTmux("\<Esc>[?2004h")
-   let &t_EI .= WrapForTmux("\<Esc>[?2004l")
-
-   function! XTermPasteBegin()
-     set pastetoggle=<Esc>[201~
+   function! XTermPasteBegin(ret)
+     set pastetoggle=<f29>
      set paste
-     return ""
+     return a:ret
    endfunction
 
-   inoremap <special> <expr> <Esc>[200~ XTermPasteBegin()
+   execute "set <f28>=\<Esc>[200~"
+   execute "set <f29>=\<Esc>[201~"
+   map <expr> <f28> XTermPasteBegin("i")
+   imap <expr> <f28> XTermPasteBegin("")
+   vmap <expr> <f28> XTermPasteBegin("c")
+   cmap <f28> <nop>
+   cmap <f29> <nop>
 endif
 
 " Multiline comments often confuse vim syntax highlighting - these maps
@@ -612,6 +607,7 @@ if executable('chmod')
          echoerr 'Error running chmod: ' . v:shell_error
       endif
       checktime
+      autocmd! FileChangedShell <buffer>
    endfunction
    function! _BufChangedCB()
       autocmd! FileChangedShell <buffer>
@@ -619,6 +615,15 @@ if executable('chmod')
    command! ToggleXbit if executable(expand("%:p")) | call SetExecutableBit(0) | else | call SetExecutableBit(1) | endif
 endif
 
+function! Code()
+    setlocal expandtab tabstop=8 softtabstop=4 shiftwidth=4
+endfunction
+command! Code call Code()
+
+function! Text()
+    setlocal expandtab tabstop=8 softtabstop=3 shiftwidth=3
+endfunction
+command! Text call Text()
 
 " ----------
 " From http://slobin.pp.ru/vim/_vimrc.html
@@ -785,15 +790,5 @@ command! UName Uname
 endif
 " ----------
 
-if has("iconv")
-function! SetViminfoEncoding()
-   " Set universal encoding for .viminfo
-   if &encoding != 'utf-8'
-      set encoding=utf-8
-   endif
-endfunction
-autocmd VimLeavePre * call SetViminfoEncoding()
-endif
-
 " This has to go to the very end of ~/.vimrc to allow reading the .vimrc
 set secure        " safer working with script files in the current directory