summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-09-09 17:47:38 +0200
committerBram Moolenaar <Bram@vim.org>2014-09-09 17:47:38 +0200
commitf638cbce7623e2233f7912a9493cd51e6adff159 (patch)
tree235dc0987014bcaaeb4d87d70a1054e985bfa59d
parent5a4eceb02a12f1746b84eea680ddb511924248ac (diff)
downloadvim-git-f638cbce7623e2233f7912a9493cd51e6adff159.tar.gz
updated for version 7.4.439v7.4.439
Problem: Duplicate message in message history. Some quickfix messages appear twice. (Gary Johnson) Solution: Do not reset keep_msg too early. (Hirohito Higashi)
-rw-r--r--src/main.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/main.c b/src/main.c
index 70d291171..73f6697ac 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1249,9 +1249,9 @@ main_loop(cmdwin, noexmode)
char_u *p;
/* msg_attr_keep() will set keep_msg to NULL, must free the
- * string here. */
+ * string here. Don't reset keep_msg, msg_attr_keep() uses it
+ * to check for duplicates. */
p = keep_msg;
- keep_msg = NULL;
msg_attr(p, keep_msg_attr);
vim_free(p);
}
diff --git a/src/version.c b/src/version.c
index 0ad0376f8..edc87f354 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 */
/**/
+ 439,
+/**/
438,
/**/
437,