diff options
| author | Scott Prager <splinterofchaos@gmail.com> | 2014-10-10 22:05:42 -0400 |
|---|---|---|
| committer | Scott Prager <splinterofchaos@gmail.com> | 2014-11-11 11:55:59 -0500 |
| commit | bffea01c89bfe2c93169f65b50653d63dcb8e035 (patch) | |
| tree | 0cad9b3ba358f49c07b66f580453cbb1e6f3e849 | |
| parent | 0051a7cb259f2b88e01b9efe92580aafc970fbe4 (diff) | |
| download | rneovim-bffea01c89bfe2c93169f65b50653d63dcb8e035.tar.gz rneovim-bffea01c89bfe2c93169f65b50653d63dcb8e035.tar.bz2 rneovim-bffea01c89bfe2c93169f65b50653d63dcb8e035.zip | |
vim-patch:7.4.415
Problem: Cannot build. Warning for shadowed variable. (John Little)
Solution: Add missing change. Remove declaration.
https://code.google.com/p/vim/source/detail?name=v7-4-414&r=20dbceb6f4713ccd01be45dc531abc269fbb7579
| -rw-r--r-- | src/nvim/ex_docmd.c | 3 | ||||
| -rw-r--r-- | src/nvim/fileio.h | 1 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index 7e0122acd2..134def0c2c 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -1464,8 +1464,7 @@ static char_u * do_one_cmd(char_u **cmdlinep, if (p != NULL && ea.cmdidx == CMD_SIZE && !ea.skip && ASCII_ISUPPER(*ea.cmd) && has_cmdundefined()) { - char_u *p = ea.cmd; - + p = ea.cmd; while (ASCII_ISALNUM(*p)) { ++p; } diff --git a/src/nvim/fileio.h b/src/nvim/fileio.h index 7e4ced554d..29bd1307f6 100644 --- a/src/nvim/fileio.h +++ b/src/nvim/fileio.h @@ -99,6 +99,7 @@ typedef enum auto_event { EVENT_SHELLFILTERPOST, /* after ":1,2!cmd", ":w !cmd", ":r !cmd". */ EVENT_TEXTCHANGED, /* text was modified */ EVENT_TEXTCHANGEDI, /* text was modified in Insert mode*/ + EVENT_CMDUNDEFINED, ///< command undefined NUM_EVENTS /* MUST be the last one */ } event_T; diff --git a/src/nvim/version.c b/src/nvim/version.c index 7f80c57242..9b5b995801 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -250,7 +250,7 @@ static int included_patches[] = { 418, //417, //416, - //415, + 415, 414, //413 NA //412 NA |