diff options
| author | Jurica Bradaric <jbradaric@gmail.com> | 2016-01-30 18:40:30 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-02-09 01:36:29 -0500 |
| commit | b0cfb6905a14b5701ae83149a17bf9408bd33ae4 (patch) | |
| tree | 951069f3e0f64250f144bddf2e12a00a211b5e45 /src | |
| parent | a9a25fda42abdec267e89bf607f35e60806ec092 (diff) | |
| download | rneovim-b0cfb6905a14b5701ae83149a17bf9408bd33ae4.tar.gz rneovim-b0cfb6905a14b5701ae83149a17bf9408bd33ae4.tar.bz2 rneovim-b0cfb6905a14b5701ae83149a17bf9408bd33ae4.zip | |
vim-patch:7.4.758
Problem: When 'conceallevel' is 1 and quitting the command-line window with
CTRL-C the first character ':' is erased.
Solution: Reset 'conceallevel' in the command-line window. (Hirohito
Higashi)
https://github.com/vim/vim/commit/fa67fbe6b84133207271e4ff582c3d589172efd9
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/ex_getln.c | 2 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index 96bf2c78d2..d015f6b4a0 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -5136,6 +5136,8 @@ static int ex_window(void) /* Don't execute autocommands while deleting the window. */ block_autocmds(); + // Avoid command-line window first character being concealed + curwin->w_p_cole = 0; wp = curwin; bp = curbuf; win_goto(old_curwin); diff --git a/src/nvim/version.c b/src/nvim/version.c index 42b3802ca7..b596345f46 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -530,7 +530,7 @@ static int included_patches[] = { // 761 NA // 760, // 759 NA - // 758, + 758, // 757 NA // 756 NA 755, |