diff options
| author | Felipe Morales <hel.sheep@gmail.com> | 2016-02-19 22:07:46 +0100 |
|---|---|---|
| committer | Felipe Morales <hel.sheep@gmail.com> | 2016-02-19 22:07:46 +0100 |
| commit | af67f022ca3ea3f409e2a0925aa0ea02fd7fd0f9 (patch) | |
| tree | 4d3b541a919cf38ed329890e09c8ce45a75f7569 /src | |
| parent | 00347ec781cf64c8e9c81dde456312f70ec3f4cb (diff) | |
| parent | d4bb84367f3cc00528ac9b28dea3e1e9962ccf88 (diff) | |
| download | rneovim-af67f022ca3ea3f409e2a0925aa0ea02fd7fd0f9.tar.gz rneovim-af67f022ca3ea3f409e2a0925aa0ea02fd7fd0f9.tar.bz2 rneovim-af67f022ca3ea3f409e2a0925aa0ea02fd7fd0f9.zip | |
Merge pull request #4264 from watiko/vim-7.4.922
vim-patch:7.4.922
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/ex_cmds.c | 1 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c index 4d62dd0ff9..4a423269cc 100644 --- a/src/nvim/ex_cmds.c +++ b/src/nvim/ex_cmds.c @@ -4779,6 +4779,7 @@ void ex_helptags(exarg_T *eap) WILD_LIST_NOTFOUND|WILD_SILENT, WILD_EXPAND_FREE); if (dirname == NULL || !os_isdir(dirname)) { EMSG2(_("E150: Not a directory: %s"), eap->arg); + xfree(dirname); return; } diff --git a/src/nvim/version.c b/src/nvim/version.c index 940107ee66..3b75135b72 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -366,7 +366,7 @@ static int included_patches[] = { // 925, // 924 NA // 923 NA - // 922, + 922, // 921 NA // 920 NA // 919 NA |