.vimrc: Restore `WrapForTmux`

[dotfiles.git] / .vimrc

diff --git a/.vimrc b/.vimrc
index 147fb38d400f64de2251c0ee30dec65804ce86ae..41d0e220f5ca14682d5a2dd2ba6607e788f70c9d 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -22,6 +22,10 @@ if exists("b:wrap") " Only do this on the second and subsequent :source's
       set nomodified
    endif
    unlet fenc ftype mod
+
+elseif filereadable($VIMRUNTIME . "/defaults.vim")
+   unlet! skip_defaults_vim
+   source $VIMRUNTIME/defaults.vim
 endif
 
 " No, it is not VI, it is VIM! It is important to set this first, because this
@@ -34,6 +38,7 @@ behave xterm
 " 2 moving around, searching and patterns
 
 set ignorecase    " Ignore case in search patterns
+set noincsearch   " No incremental searching
 set smartcase     " Match 'word' case-insensitive and 'Word' case-sensitive
 
 set nostartofline " Keep cursor's column
@@ -47,6 +52,7 @@ set list          " listchars only works with 'list'
 " Show tabs, non-breaking/trailing spaces, long lines
 set listchars=tab:>_,nbsp:_,trail:_,extends:+,precedes:+
 " Another usefull additions: eol:$,space:_
+set scrolloff=0 " number of screen lines to show around the cursor
 set wrap          " Visually wrap long lines
 
 " With 'set wrap' wrap long lines at a character in 'breakat'
@@ -81,7 +87,9 @@ set titlestring=%t%(\ %M%)%(\ (%{expand(\"%:p:h\")})%)%(\ %a%)\ -\ [%{$USER}@%{h
 
 " 9 using the mouse
 
-set mouse=ar      " Use mouse in all modes, plus hit-return
+if has('mouse')
+   set mouse=ar      " Use mouse in all modes, plus hit-return
+endif
 
 " 12 messages and info
 
@@ -177,15 +185,16 @@ set fileencodings=ucs-bom,us-ascii,utf-8,koi8-r,cp1251,cp866,latin1
 " ' - number of files for which the marks are remembered;
 " " and < - maximum number of lines saved for a register;
 " s - maximum size of an item in Kbytes.
+set viminfo=!,h,'50
 if version < 603
-   set viminfo=!,h,'50,\"1000
+   set viminfo+=\"1000
 else
-   set viminfo=!,h,'50,<1000,s10
+   set viminfo+=<1000,s10
 endif
 
 " c - convert viminfo to the current encoding;
 if has("iconv")
-   set viminfo^=c
+   set viminfo+=c
 endif
 
 " Removable media paths
@@ -270,8 +279,26 @@ 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
+   " 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
+
+   function! XTermPasteBegin(ret)
+     set pastetoggle=<f29>
+     set paste
+     return a:ret
+   endfunction
+
+   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://coderwall.com/p/if9mda/automatically-set-paste-mode-in-vim-when-pasting-in-insert-mode
    function! WrapForTmux(s)
      if !exists('$TMUX')
        return a:s
@@ -283,16 +310,18 @@ else
      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~
-     set paste
-     return ""
-   endfunction
-
-   inoremap <special> <expr> <Esc>[200~ XTermPasteBegin()
+   " https://vim.fandom.com/wiki/Change_cursor_shape_in_different_modes
+   let &t_EI.=WrapForTmux("\e[2 q") "EI = NORMAL mode (ELSE)
+   let &t_SI.=WrapForTmux("\e[6 q") "SI = INSERT mode
+   let &t_SR.=WrapForTmux("\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
@@ -564,6 +593,9 @@ function! SlowTerm()
    set nowildmenu
    set wildmode=list:longest
    set viminfo=!,h,'10,<100,s5
+   if has("iconv")
+      set viminfo+=c
+   endif
    syntax off
    highlight NonText cterm=NONE ctermfg=NONE
 endfunction
@@ -583,7 +615,7 @@ endif
 
 
 " From Tip 212:
-" http://vim.wikia.com/wiki/Setting_file_attributes_without_reloading_a_buffer
+" http://vim.fandom.com/wiki/Setting_file_attributes_without_reloading_a_buffer
 
 if executable('chmod')
    function! SetExecutableBit(x)
@@ -600,6 +632,7 @@ if executable('chmod')
          echoerr 'Error running chmod: ' . v:shell_error
       endif
       checktime
+      autocmd! FileChangedShell <buffer>
    endfunction
    function! _BufChangedCB()
       autocmd! FileChangedShell <buffer>
@@ -607,6 +640,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
@@ -650,7 +692,7 @@ endif
 
 " Called automagically after every buffer read, enables fileencoding
 " setting from modeline (see Tip #911:
-" http://vim.wikia.com/wiki/How_to_make_fileencoding_work_in_the_modeline)
+" http://vim.fandom.com/wiki/How_to_make_fileencoding_work_in_the_modeline)
 function! AutoEncoding()
   if &modified && &fileencoding != ""
     call SetupEncoding(&fileencoding)