summaryrefslogtreecommitdiffstats
path: root/src
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
commitfa67fbe6b84133207271e4ff582c3d589172efd9 (patch)
tree43f1e8221cf6835a335019238deeb819aba66dd6 /src
parentb5c3265521749fda81ae4b052de35a0d1209cf50 (diff)
patch 7.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)
Diffstat (limited to 'src')
-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 cd9dffdeaf..c6bbf670c1 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 917f71a652..4b9329faa8 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,