X-Git-Url: https://git.phdru.name/?p=dotfiles.git;a=blobdiff_plain;f=.vimrc;h=b0a7f7b182cb086d9a64f05627a6d174d7ea5813;hp=836b64623e3251782df63a9f3dec8bcc48eb1713;hb=41c57a5fd1cf36e9115e8904c068b5777a49ba3e;hpb=23520d25323173ac8d8bac0b1aba6165c4a34997 diff --git a/.vimrc b/.vimrc index 836b646..b0a7f7b 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:+ @@ -95,6 +99,10 @@ endif set ruler " Show cursor position below each window set showcmd " Show (partial) command keys in the status line +set visualbell " Use visual bell instead of beeping +if v:version >= 800 + set belloff=error,insertmode " Do not ring the bell for these reasons +endif " Short message for [Modified]; " overwrite message for writing a file with subsequent message; @@ -215,6 +223,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 @@ -233,7 +243,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 @@ -257,6 +268,26 @@ else set t_Sb="\e[4%dm" endif + " KP_Up -> Up + map Ox OA + map! Ox OA + " KP_Down -> Down + map Or OB + map! Or OB + " KP_Right -> Right + map Ov OC + map! Ov OC + " KP_Left -> Left + map Ot OD + map! Ot OD + " KP_Home -> Home + map Ow [7~ + map! Ow [7~ + " KP_End -> End + map Oq [8~ + map! Oq [8~ + " KP_Prev (PgDn) and KP_Next (PgUp) work fine, no mapping is required + " 'autoselect' to always put selected text on the clipboard; " 'unnamed' to use the * register like unnamed register '*' " for all yank, delete and put operations; @@ -298,10 +329,32 @@ else 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 + + if exists('$TMUX') + let tmux_start = "\Ptmux;" + let tmux_end = "\\\" + + return tmux_start . substitute(a:s, "\", "\\", 'g') . tmux_end + endif + + return a:s + endfunction + " 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 + 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 @@ -357,13 +410,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 @@ -429,7 +482,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 @@ -684,8 +737,6 @@ command! Text call Text() function! AutoEncoding() if &modified && &fileencoding != "" call SetupEncoding(&fileencoding) - else - redraw endif autocmd! auto-encoding augroup! auto-encoding @@ -750,6 +801,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 @@ -803,5 +863,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