mirror of
https://github.com/neovim/neovim.git
synced 2025-09-22 19:18:34 +00:00
cf9b7a37cc
Problem: defaults: 'diffopt' option value can be improved
Solution: Update diffopt defaults to include "indent-heuristic" and
"inline:char" (Yee Cheng Chin)
The default diff options have not been updated much despite new
functionality having been added to Vim.
- indent-heurstic: This has been enabled by default in Git since
33de716387 in 2017. Given that Vim uses xdiff from Git, it makes sense
to track the default configuration from Git.
- inline:char: This turns on character-wise inline highlighting which is
generally much better than the default inline:simple. It has been
implemented since vim/vim#16881 and we have not seen reports of any issues
with it, and it has received good feedbacks.
closes: vim/vim#18255
976b365305
Co-authored-by: Yee Cheng Chin <ychin.git@gmail.com>
120 lines
3.1 KiB
VimL
120 lines
3.1 KiB
VimL
if exists('s:did_load')
|
|
" Align Nvim defaults to Vim.
|
|
set commentstring=/*\ %s\ */
|
|
if g:testname !~ 'test_ins_complete_no_halt\.vim$'
|
|
set complete=.,w,b,u,t,i
|
|
set completeopt=menu,preview
|
|
endif
|
|
set define=^\\s*#\\s*define
|
|
set diffopt=internal,filler,closeoff,indent-heuristic,inline:char
|
|
set directory^=.
|
|
set display=
|
|
set fillchars=vert:\|,foldsep:\|,fold:-
|
|
set formatoptions=tcq
|
|
set fsync
|
|
set include=^\\s*#\\s*include
|
|
set joinspaces
|
|
set jumpoptions=
|
|
set laststatus=1
|
|
set listchars=eol:$
|
|
set maxsearchcount=99
|
|
set mousemodel=extend
|
|
set nohidden nosmarttab noautoindent noautoread noruler noshowcmd
|
|
set nohlsearch noincsearch
|
|
set nrformats=bin,octal,hex
|
|
set sessionoptions+=options
|
|
set shelltemp
|
|
set shortmess=filnxtToOS
|
|
set sidescroll=0
|
|
set startofline
|
|
set switchbuf=
|
|
set tags=./tags,tags
|
|
set undodir^=.
|
|
set viewoptions+=options
|
|
set wildoptions=
|
|
if has('win32')
|
|
set isfname+=:
|
|
endif
|
|
if g:testname !~ 'test_mapping\.vim$'
|
|
" Make "Q" switch to Ex mode.
|
|
" This does not work for all tests as Nvim only supports Vim Ex mode.
|
|
nnoremap Q gQ<Cmd>call<SID>ExStart()<CR>
|
|
endif
|
|
endif
|
|
|
|
" Common preparations for running tests.
|
|
|
|
" Only load this once.
|
|
if exists('s:did_load')
|
|
finish
|
|
endif
|
|
let s:did_load = 1
|
|
|
|
func s:ExStart()
|
|
call feedkeys($"\<Cmd>call{expand('<SID>')}ExMayEnd()\<CR>")
|
|
endfunc
|
|
|
|
func s:ExMayEnd()
|
|
" When :normal runs out of characters in Vim, the behavior is different in
|
|
" normal Ex mode vs. Vim Ex mode.
|
|
" - In normal Ex mode, "\n" is used.
|
|
" - In Vim Ex mode, Ctrl-C is used.
|
|
" Nvim only supports Vim Ex mode, so emulate the normal Ex mode behavior.
|
|
if state('m') == '' && mode(1) == 'cv' && getcharstr(1) == "\<C-C>"
|
|
call feedkeys("\n")
|
|
endif
|
|
endfunc
|
|
|
|
" Clear Nvim default user commands, mappings and menus.
|
|
comclear
|
|
mapclear
|
|
mapclear!
|
|
aunmenu *
|
|
tlunmenu *
|
|
autocmd! nvim.popupmenu
|
|
|
|
" Undo the 'grepprg' and 'grepformat' setting in _defaults.lua.
|
|
set grepprg& grepformat&
|
|
|
|
" Prevent Nvim log from writing to stderr.
|
|
let $NVIM_LOG_FILE = exists($NVIM_LOG_FILE) ? $NVIM_LOG_FILE : 'Xnvim.log'
|
|
|
|
" Make sure 'runtimepath' and 'packpath' does not include $HOME.
|
|
set rtp=$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after
|
|
let &packpath = &rtp
|
|
|
|
" Avoid storing shell history.
|
|
let $HISTFILE = ""
|
|
|
|
" Use default shell on Windows to avoid segfault, caused by TUI
|
|
if has('win32')
|
|
let $SHELL = ''
|
|
let $TERM = ''
|
|
let &shell = empty($COMSPEC) ? exepath('cmd.exe') : $COMSPEC
|
|
set shellcmdflag=/s/c shellxquote=\" shellredir=>%s\ 2>&1
|
|
let &shellpipe = &shellredir
|
|
endif
|
|
|
|
" Detect user modules for language providers
|
|
let $PYTHONUSERBASE = $HOME . '/.local'
|
|
if executable('gem')
|
|
let $GEM_PATH = system('gem env gempath')
|
|
endif
|
|
|
|
" Have current $HOME available as $ORIGHOME. $HOME is used for option
|
|
" defaults before we get here, and test_mksession checks that.
|
|
let $ORIGHOME = $HOME
|
|
|
|
if !exists('$XDG_CONFIG_HOME')
|
|
let $XDG_CONFIG_HOME = $HOME .. '/.config'
|
|
endif
|
|
|
|
" Make sure $HOME does not get read or written.
|
|
let $HOME = expand(getcwd() . '/XfakeHOME')
|
|
if !isdirectory($HOME)
|
|
call mkdir($HOME)
|
|
endif
|
|
|
|
" Use Vim's default color scheme
|
|
colorscheme vim
|