diff options
author | Naveen Kumar Molleti <nerd.naveen@gmail.com> | 2014-09-27 00:58:57 +0530 |
---|---|---|
committer | Justin M. Keyes <justinkz@gmail.com> | 2014-10-16 04:04:49 +0000 |
commit | af40647b660ddce2542fd19e553bd8f85e69d121 (patch) | |
tree | 33ef6b5daee38734eb45a1fa876b1634c306673b | |
parent | 3195aadf276edc1955163879b71b1ad01ed9e77e (diff) | |
download | rneovim-af40647b660ddce2542fd19e553bd8f85e69d121.tar.gz rneovim-af40647b660ddce2542fd19e553bd8f85e69d121.tar.bz2 rneovim-af40647b660ddce2542fd19e553bd8f85e69d121.zip |
vim-patch:7.4.439 #1245
Problem: Duplicate message in message history. Some quickfix messages
appear twice. (Gary Johnson)
Solution: Do not reset keep_msg too early. (Hirohito Higashi)
https://code.google.com/p/vim/source/detail?r=v7-4-439
-rw-r--r-- | src/nvim/main.c | 6 | ||||
-rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c index 81621b0d80..128d1a784c 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -681,10 +681,10 @@ main_loop ( if (keep_msg != NULL) { char_u *p; - /* msg_attr_keep() will set keep_msg to NULL, must free the - * string here. */ + // msg_attr_keep() will set keep_msg to NULL, must free the 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); free(p); } diff --git a/src/nvim/version.c b/src/nvim/version.c index 5fa36b8d3d..18046f9617 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -193,7 +193,7 @@ static int included_patches[] = { //442, //441, //440, - //439, + 439, //438, //437, 436, |