diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-05-18 19:33:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-18 19:33:28 +0200 |
| commit | 2ed2939597d217f12f9f6da1877684703aa9301f (patch) | |
| tree | a8f07a3e7539dcd781b29df6cdc4719551ab655c /src/nvim/option.c | |
| parent | 0ed297bdb495fa072053b3e28e0c504c7107cf5c (diff) | |
| parent | 91c4de83c9de9049fc706f319deea38e9436502e (diff) | |
| download | rneovim-2ed2939597d217f12f9f6da1877684703aa9301f.tar.gz rneovim-2ed2939597d217f12f9f6da1877684703aa9301f.tar.bz2 rneovim-2ed2939597d217f12f9f6da1877684703aa9301f.zip | |
Merge #8406 'stdpath(): handle NULL default values'
Diffstat (limited to 'src/nvim/option.c')
| -rw-r--r-- | src/nvim/option.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index 1da259e6b8..48c874196d 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -6583,15 +6583,13 @@ static void paste_option_changed(void) /// When "fname" is not NULL, use it to set $"envname" when it wasn't set yet. void vimrc_found(char_u *fname, char_u *envname) { - char_u *p; - - if (fname != NULL) { - p = (char_u *)vim_getenv((char *)envname); + if (fname != NULL && envname != NULL) { + char *p = vim_getenv((char *)envname); if (p == NULL) { - /* Set $MYVIMRC to the first vimrc file found. */ - p = (char_u *)FullName_save((char *)fname, FALSE); + // Set $MYVIMRC to the first vimrc file found. + p = FullName_save((char *)fname, false); if (p != NULL) { - vim_setenv((char *)envname, (char *)p); + vim_setenv((char *)envname, p); xfree(p); } } else { |