X-Git-Url: https://git.phdru.name/?p=dotfiles.git;a=blobdiff_plain;f=.vimrc;h=7bb96e27e7398e5b2ebf9ac7c63e4b2b12331c42;hp=25658e1a0ab51ff3ca81b9c173da3f4b2468d7ec;hb=5080a18901c90727c7dd11cc43bdefbad53f42c7;hpb=1a259ef3810bfc08c50378b4e648fb0a4dc83385 diff --git a/.vimrc b/.vimrc index 25658e1..7bb96e2 100644 --- a/.vimrc +++ b/.vimrc @@ -47,7 +47,11 @@ set whichwrap=b,s,h,l,<,>,[,],~ " Wrap to the previous/next line on all keys and " 4 displaying text set display=lastline,uhex " Show the last line instead of '@'; show non-printable chars as -set lazyredraw " Do not update screen while executing macros + +" Do not set it here, it breaks initial screen drawing and cursor positioning. +" See SetLazyRedraw at the end of the script. +" set lazyredraw " Do not update screen while executing macros + set list " listchars only works with 'list' " Show tabs, non-breaking/trailing spaces, long lines set listchars=tab:>_,nbsp:_,trail:_,extends:+,precedes:+ @@ -87,7 +91,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 @@ -183,15 +189,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 @@ -212,6 +219,8 @@ if has("gui_running") set toolbar=icons,text " how to show the toolbar endif + set guicursor+=n:block " Block cursor in normal mode + set guicursor+=i:ver10 " Solid vertical bar in insert mode set guicursor+=a:blinkon0 " Stop cursor blinking " Make shift-insert work like in Xterm @@ -230,7 +239,8 @@ if has("gui_running") " ---------- else - if (&term =~ "linux") || ($BACKGROUND == 'DARK') || ($BACKGROUND == 'dark') + if (&term =~ "linux") || (&term =~ "cygwin") || (&term =~ "putty") + \ || ($BACKGROUND == 'DARK') || ($BACKGROUND == 'dark') \ || has("win32") " Background of the terminal is black or dark grey set background=dark @@ -276,29 +286,59 @@ 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 - - let tmux_start = "\Ptmux;" - let tmux_end = "\\\" + " Bracketed paste mode + " https://github.com/ConradIrwin/vim-bracketed-paste/blob/master/plugin/bracketed-paste.vim + let &t_ti .= "\[?2004h" + let &t_te = "\e[?2004l" . &t_te - return tmux_start . substitute(a:s, "\", "\\", 'g') . tmux_end + function! XTermPasteBegin(ret) + set pastetoggle= + set paste + return a:ret endfunction - let &t_SI .= WrapForTmux("\[?2004h") - let &t_EI .= WrapForTmux("\[?2004l") + execute "set =\[200~" + execute "set =\[201~" + map XTermPasteBegin("i") + imap XTermPasteBegin("") + vmap XTermPasteBegin("c") + cmap + cmap + + "https://coderwall.com/p/if9mda/automatically-set-paste-mode-in-vim-when-pasting-in-insert-mode + " https://ttssh2.osdn.jp/manual/en/usage/tips/vim.html + function! WrapForScreenTmux(s) + if (&term =~ "screen") + let scr_start = "\P" + let scr_end = "\\\" + + return scr_start . a:s . scr_end + endif - function! XTermPasteBegin() - set pastetoggle=[201~ - set paste - return "" + if exists('$TMUX') + let tmux_start = "\Ptmux;" + let tmux_end = "\\\" + + return tmux_start . substitute(a:s, "\", "\\", 'g') . tmux_end + endif + + return a:s endfunction - inoremap [200~ XTermPasteBegin() + " https://vim.fandom.com/wiki/Change_cursor_shape_in_different_modes + let &t_EI.=WrapForScreenTmux("\e[2 q") "EI = NORMAL mode (ELSE) + let &t_SI.=WrapForScreenTmux("\e[6 q") "SI = INSERT mode + if v:version >= 800 + let &t_SR.=WrapForScreenTmux("\e[4 q") "SR = REPLACE mode + endif + + "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 @@ -346,13 +386,13 @@ autocmd BufReadPost * call RestorePosition() function! SetupEncoding(encoding) - if !has("iconv") || exists('b:encoding_set') || strlen(a:encoding) == 0 + if !has("iconv") || exists('b:encoding_set') || empty(a:encoding) return endif call RestorePosition() let b:encoding_set = 1 - if len(expand('%')) + if !empty(expand('%')) execute "edit ++enc=" . a:encoding endif endfunction @@ -418,7 +458,7 @@ function! ExtractURL() let line = getline('.') let parts = split(line, s:URL_re . '\zs') - if len(parts) == 0 + if empty(parts) throw 'ExtractURLCannotFindURL' " No URL found endif @@ -570,6 +610,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 @@ -606,6 +649,7 @@ if executable('chmod') echoerr 'Error running chmod: ' . v:shell_error endif checktime + autocmd! FileChangedShell endfunction function! _BufChangedCB() autocmd! FileChangedShell @@ -613,6 +657,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 @@ -660,8 +713,6 @@ endif function! AutoEncoding() if &modified && &fileencoding != "" call SetupEncoding(&fileencoding) - else - redraw endif autocmd! auto-encoding augroup! auto-encoding @@ -726,6 +777,15 @@ if has("spell") endif endfunction autocmd BufReadPost * call SetupSpell() + + function! SaveSpell() + if expand('%:p') == expand('~/.vim/spell/en.ascii.add') + mkspell! -ascii % + else + mkspell! % + endif + endfunction + autocmd BufWritePost ~/.vim/spell/*.add call SaveSpell() endif @@ -779,5 +839,13 @@ command! UName Uname endif " ---------- +if v:version >= 800 + function! SetLazyRedraw(timer_id) + call timer_stop(a:timer_id) " One-time event + set lazyredraw + endfunction + call timer_start(500, 'SetLazyRedraw') +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