diff options
| author | James McCoy <jamessan@jamessan.com> | 2016-09-26 22:16:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-26 22:16:17 -0400 |
| commit | f610b807b48dbaf96fe05459927a8c926b67f8bb (patch) | |
| tree | 71429c5408ff4e26af9c66adf8cf8956622373cf /src/nvim/option.c | |
| parent | 68bcb32ec43e2fab30dc05439fc77cf28793922c (diff) | |
| parent | 4ce24ff9da0f6551eeca2011dc9d05194bf02e12 (diff) | |
| download | rneovim-f610b807b48dbaf96fe05459927a8c926b67f8bb.tar.gz rneovim-f610b807b48dbaf96fe05459927a8c926b67f8bb.tar.bz2 rneovim-f610b807b48dbaf96fe05459927a8c926b67f8bb.zip | |
Merge pull request #5372 from jamessan/vim-7.4.1604
vim-patch:7.4.1604,7.4.1620,7.4.1629,7.4.1630,7.4.1642,7.4.1697
Closes #5149
Diffstat (limited to 'src/nvim/option.c')
| -rw-r--r-- | src/nvim/option.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index d8908cca90..89889aa997 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -2518,15 +2518,15 @@ did_set_string_option ( else if (varp == &p_sbo) { if (check_opt_strings(p_sbo, p_scbopt_values, TRUE) != OK) errmsg = e_invarg; - } - /* 'ambiwidth' */ - else if (varp == &p_ambw) { - if (check_opt_strings(p_ambw, p_ambw_values, FALSE) != OK) + } else if (varp == &p_ambw || (bool *)varp == &p_emoji) { + // 'ambiwidth' + if (check_opt_strings(p_ambw, p_ambw_values, false) != OK) { errmsg = e_invarg; - else if (set_chars_option(&p_lcs) != NULL) + } else if (set_chars_option(&p_lcs) != NULL) { errmsg = (char_u *)_("E834: Conflicts with value of 'listchars'"); - else if (set_chars_option(&p_fcs) != NULL) + } else if (set_chars_option(&p_fcs) != NULL) { errmsg = (char_u *)_("E835: Conflicts with value of 'fillchars'"); + } } /* 'background' */ else if (varp == &p_bg) { |