X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=sidebyside;f=.vimrc;h=836b64623e3251782df63a9f3dec8bcc48eb1713;hb=23520d25323173ac8d8bac0b1aba6165c4a34997;hp=d06404d6e4496ca27ba23b41dc4a352d73292b25;hpb=eb40e254360c1e19656666db61fb7b06614cb346;p=dotfiles.git

diff --git a/.vimrc b/.vimrc
index d06404d..836b646 100644
--- a/.vimrc
+++ b/.vimrc
@@ -279,29 +279,37 @@ 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>
+
+   " https://vim.fandom.com/wiki/Change_cursor_shape_in_different_modes
+   let &t_EI.="\e[2 q" "EI = NORMAL mode (ELSE)
+   let &t_SI.="\e[6 q" "SI = INSERT mode
+   let &t_SR.="\e[4 q" "SR = REPLACE mode
+
+   "Cursor settings:
+   "  1 -> blinking block
+   "  2 -> solid block 
+   "  3 -> blinking underscore
+   "  4 -> solid underscore
+   "  5 -> blinking vertical bar
+   "  6 -> solid vertical bar
 endif
 
 " Multiline comments often confuse vim syntax highlighting - these maps
@@ -612,6 +620,7 @@ if executable('chmod')
          echoerr 'Error running chmod: ' . v:shell_error
       endif
       checktime
+      autocmd! FileChangedShell <buffer>
    endfunction
    function! _BufChangedCB()
       autocmd! FileChangedShell <buffer>
@@ -619,6 +628,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