diff options
| -rw-r--r-- | runtime/optwin.vim | 3 | ||||
| -rw-r--r-- | src/nvim/diff.c | 3 | ||||
| -rw-r--r-- | src/nvim/ex_getln.c | 12 | ||||
| -rw-r--r-- | src/nvim/testdir/Makefile | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/test_options.vim | 4 |
5 files changed, 12 insertions, 12 deletions
diff --git a/runtime/optwin.vim b/runtime/optwin.vim index 8f04e495e5..13d0db0390 100644 --- a/runtime/optwin.vim +++ b/runtime/optwin.vim @@ -1087,6 +1087,9 @@ if has("quickfix") call <SID>OptionG("gp", &gp) call append("$", "grepformat\tlist of formats for output of 'grepprg'") call <SID>OptionG("gfm", &gfm) + call append("$", "makeencoding\tencoding of the \":make\" and \":grep\" output") + call append("$", "\t(global or local to buffer)") + call <SID>OptionG("menc", &menc) endif diff --git a/src/nvim/diff.c b/src/nvim/diff.c index a32ac645e3..e9ecf98653 100644 --- a/src/nvim/diff.c +++ b/src/nvim/diff.c @@ -941,9 +941,6 @@ void ex_diffpatch(exarg_T *eap) } #endif - // patch probably has written over the screen - redraw_later(CLEAR); - // Delete any .orig or .rej file created. STRCPY(buf, tmp_new); STRCAT(buf, ".orig"); diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index 54bbe66620..c4e0827dad 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -4058,12 +4058,12 @@ static int showmatches(expand_T *xp, int wildmenu) msg_start(); /* prepare for paging */ } - if (got_int) - got_int = FALSE; /* only int. the completion, not the cmd line */ - else if (wildmenu) - win_redr_status_matches(xp, num_files, files_found, 0, showtail); - else { - /* find the length of the longest file name */ + if (got_int) { + got_int = false; // only int. the completion, not the cmd line + } else if (wildmenu) { + win_redr_status_matches(xp, num_files, files_found, -1, showtail); + } else { + // find the length of the longest file name maxlen = 0; for (i = 0; i < num_files; ++i) { if (!showtail && (xp->xp_context == EXPAND_FILES diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 5a6e03f182..b945b29683 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -11,7 +11,7 @@ SCRIPTSOURCE := ../../../runtime export SHELL := sh export NVIM_PRG := $(NVIM_PRG) -export TMPDIR := Xtest-tmpdir +export TMPDIR := $(abspath ../../../Xtest-tmpdir) SCRIPTS_DEFAULT = \ test14.out \ diff --git a/src/nvim/testdir/test_options.vim b/src/nvim/testdir/test_options.vim index d1536b5c43..8af315fdea 100644 --- a/src/nvim/testdir/test_options.vim +++ b/src/nvim/testdir/test_options.vim @@ -152,8 +152,8 @@ func Test_set_completion() " Expand directories. call feedkeys(":set cdpath=./\<C-A>\<C-B>\"\<CR>", 'tx') - call assert_match(' ./samples/ ', @:) - call assert_notmatch(' ./small.vim ', @:) + call assert_match('./samples/ ', @:) + call assert_notmatch('./small.vim ', @:) " Expand files and directories. call feedkeys(":set tags=./\<C-A>\<C-B>\"\<CR>", 'tx') |