summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2015-06-25 18:20:36 +0200
committerBram Moolenaar <bram@vim.org>2015-06-25 18:20:36 +0200
commit6ba60d1f0d954af6fb256c262218901b1bd0ae22 (patch)
treef7cac1a00efd00bb7010ce14e5fabf7a40854f81
parent232b0b764ccd7189e22befc9f7221341a36ecd66 (diff)
downloadvim-6ba60d1f0d954af6fb256c262218901b1bd0ae22.tar.gz
patch 7.4.758v7.4.758v7-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)
-rw-r--r--src/ex_getln.c4
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c
index cd9dffde..c6bbf670 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -6611,6 +6611,10 @@ ex_window()
/* Don't execute autocommands while deleting the window. */
block_autocmds();
# endif
+# ifdef FEAT_CONCEAL
+ /* Avoid command-line window first character being concealed. */
+ curwin->w_p_cole = 0;
+# endif
wp = curwin;
bp = curbuf;
win_goto(old_curwin);
diff --git a/src/version.c b/src/version.c
index 917f71a6..4b9329fa 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 758,
+/**/
757,
/**/
756,