X-Git-Url: https://git.phdru.name/?p=dotfiles.git;a=blobdiff_plain;f=.vimrc;h=c4e396cc393523f8c4014a525f518d21445bbfe9;hp=0ff6ea1ec534ac8bde907caba3e627d601bb0d86;hb=8f07462da993224ab6e265a34f49915a76ddb3a4;hpb=904a5914057b2f40c37534072c2c4ae7243e9076 diff --git a/.vimrc b/.vimrc index 0ff6ea1..c4e396c 100644 --- 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 @@ -44,7 +49,10 @@ set whichwrap=b,s,h,l,<,>,[,],~ " Wrap to the previous/next line on all keys and set display=lastline,uhex " Show the last line instead of '@'; show non-printable chars as set lazyredraw " Do not update screen while executing macros set list " listchars only works with 'list' -set listchars=tab:>_,trail:_,extends:+ " Show tabs, trailing spaces, long lines +" 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' @@ -79,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 @@ -175,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 @@ -313,7 +324,8 @@ if version >= 700 " Save all files before running any quickfix command (grep, makeprg, etc.) autocmd QuickFixCmdPre * wall " automatically close quickfix if it's the only window left -autocmd WinEnter * if winnr('$') == 1 && &buftype == "quickfix" | quit | endif +autocmd WinEnter * if winnr('$') == 1 && + \ index(["nofile", "quickfix"], &buftype) >= 0 | quit | endif endif " Syntax highlighting @@ -561,6 +573,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 @@ -571,20 +586,16 @@ endif if has("python") -python << END_OF_PYTHON -import sys, os - -virtualenv_dir = os.environ.get('VIRTUAL_ENV') -if virtualenv_dir: - sys.path.insert(0, virtualenv_dir) - activate_this = os.path.join(virtualenv_dir, 'bin', 'activate_this.py') - execfile(activate_this, dict(__file__=activate_this)) -END_OF_PYTHON +pyfile ~/.vim/python/virtualenv.py +endif + +if has("python3") +py3file ~/.vim/python/virtualenv.py 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) @@ -601,6 +612,7 @@ if executable('chmod') echoerr 'Error running chmod: ' . v:shell_error endif checktime + autocmd! FileChangedShell endfunction function! _BufChangedCB() autocmd! FileChangedShell @@ -608,6 +620,15 @@ if executable('chmod') command! ToggleXbit if executable(expand("%:p")) | call SetExecutableBit(0) | else | call SetExecutableBit(1) | endif endif +function! Code() + setlocal tabstop=8 softtabstop=4 shiftwidth=4 expandtab +endfunction +command! Code call Code() + +function! Text() + setlocal tabstop=8 softtabstop=3 shiftwidth=3 expandtab +endfunction +command! Text call Text() " ---------- " From http://slobin.pp.ru/vim/_vimrc.html @@ -651,7 +672,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) @@ -730,70 +751,7 @@ endfunction if has("python") - -python << END_OF_PYTHON - -import sys, rlcompleter, unicodedata, vim -from itertools import * -vim_complete = rlcompleter.Completer().complete - -def vim_comp_list(): - """Implementation of CompList() function""" - arglead = vim.eval("a:ArgLead") - fence = int(vim.eval("match(a:ArgLead, '\(\w\|\.\)*$')")) - left, right = arglead[:fence], arglead[fence:] - try: - completions = (vim_complete(right, i) for i in count()) - candidates = list(takewhile(bool, completions)) - except NameError: - candidates = [] - suggestions = [left + x for x in candidates] - vim.command("return " + repr(suggestions)) - -def vim_calc(command): - """Implementation of :Calc command""" - global _ - try: - result = eval(command) - except SyntaxError: - exec command in globals() - else: - if result != None: - print result - _ = result - xx = ''.join('\\x%02x' % ord(x) for x in str(_)) - vim.command('let @" = "%s"' % xx) - -def vim_pydo(command): - """Implementation of :Pydo command""" - codeobj = compile(command, "command", "eval") - line1 = vim.current.range.start - line2 = vim.current.range.end - delta = 0 - for numz in range(line1, line2+1): - line = vim.current.buffer[numz-delta] - uline = unicode(line, vim.eval('&fileencoding')) - num = numz + 1 - words = line.split() - result = eval(codeobj, globals(), locals()) - if result is None or result is False: - del vim.current.buffer[numz-delta] - delta += 1 - continue - if isinstance(result, list) or isinstance(result, tuple): - result = " ".join(map(str, result)) - else: - result = str(result) - vim.current.buffer[numz-delta] = result - -def vim_unicode_name(): - try: - char = vim.eval("matchstr(getline('.'), '.', col('.') - 1)") - print map(unicodedata.name, char.decode(vim.eval("&encoding"))) - except (AttributeError, ValueError), target: - print "%s: %s" % (target.__class__.__name__, target.message) - -END_OF_PYTHON +pyfile ~/.vim/python/completion.py " Custom completion for python expressions function! CompList(ArgLead, CmdLine, CursorPos) @@ -810,10 +768,42 @@ command! -nargs=+ -range -complete=customlist,CompList Pydo " Display unicode name for the character under cursor command! Uname python vim_unicode_name() -command! UName call Uname() +endif + +if has("python3") +py3file ~/.vim/python/completion.py + +" Custom completion for python expressions +function! CompList(ArgLead, CmdLine, CursorPos) + python3 vim_comp_list() +endfunction + +" Python command line calculator +command! -nargs=+ -range -complete=customlist,CompList Calc + \ , python3 vim_calc() +" Python text range filter +command! -nargs=+ -range -complete=customlist,CompList Pydo + \ , python3 vim_pydo() + +" Display unicode name for the character under cursor +command! Uname python3 vim_unicode_name() +endif + +if has("python") || has("python3") +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