From b6fdc3eb47c2d25c194505f1dff1f98fa4302f1e Mon Sep 17 00:00:00 2001 From: watiko Date: Thu, 11 Feb 2016 21:59:08 +0900 Subject: [PATCH] vim-patch:7.4.830 Problem: Resetting 'encoding' when doing ":set all&" causes problems. (Bjorn Linse) Display is not updated. Solution: Do not reset 'encoding'. Do a full redraw. https://github.com/vim/vim/commit/b341dda575899458f7075614dcedf0a80ee9d080 --- ":set all&" does not reset 'encoding' in neovim. --- src/nvim/option.c | 5 +++-- src/nvim/version.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/nvim/option.c b/src/nvim/option.c index c11e22703e..616eba31f6 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -1150,9 +1150,10 @@ do_set ( */ arg += 3; if (*arg == '&') { - ++arg; - /* Only for :set command set global value of local options. */ + arg++; + // Only for :set command set global value of local options. set_options_default(OPT_FREE | opt_flags); + redraw_all_later(CLEAR); } else { showoptions(1, opt_flags); did_show = TRUE; diff --git a/src/nvim/version.c b/src/nvim/version.c index 4b00349270..de045e8dae 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -458,7 +458,7 @@ static int included_patches[] = { // 833, // 832, // 831, - // 830, + 830, // 829 NA 828, // 827,