aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYamakaky <yamakaky@gmail.com>2015-05-05 19:24:27 +0200
committerMichael Reed <m.reed@mykolab.com>2015-05-06 17:13:04 -0400
commitdce0b98f808458e48e7e15e90d2d8daaf11d6b8f (patch)
tree8008a4ef410f0ab92aeb50846220ba9f0f46482d
parentb6af1afee6eab0a430533efcbb8af6c6b1ffe585 (diff)
downloadrneovim-dce0b98f808458e48e7e15e90d2d8daaf11d6b8f.tar.gz
rneovim-dce0b98f808458e48e7e15e90d2d8daaf11d6b8f.tar.bz2
rneovim-dce0b98f808458e48e7e15e90d2d8daaf11d6b8f.zip
vim-patch:7.4.590 #2592
Problem: Using ctrl_x_mode as if it contains flags. Solution: Don't use AND with CTRL_X_OMNI. (Hirohito Higashi) https://github.com/vim/vim/commit/v7-4-590 It was already included in neovim, see #2527.
-rw-r--r--src/nvim/version.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 2eb2d5c4ae..cc877d0fbe 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -193,7 +193,7 @@ static int included_patches[] = {
//593,
//592,
//591 NA
- //590,
+ 590,
//589 NA
588,
//587,