diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-07-03 23:33:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-03 23:33:08 +0200 |
| commit | 008b604bacbbeeaf0e04f94b1d331b11ebec631a (patch) | |
| tree | 45a004c00c61f0bbe84cbf291093b6dffcf0bfb1 /src/nvim/option.c | |
| parent | e333957a1a9ae64b7daa36e08fd1df583114d4ba (diff) | |
| parent | 35898cff5d1d6dc60e0d7b87bfe106539453b031 (diff) | |
| download | rneovim-008b604bacbbeeaf0e04f94b1d331b11ebec631a.tar.gz rneovim-008b604bacbbeeaf0e04f94b1d331b11ebec631a.tar.bz2 rneovim-008b604bacbbeeaf0e04f94b1d331b11ebec631a.zip | |
Merge #6947 from ZyX-I/consistent-get_keymap
Diffstat (limited to 'src/nvim/option.c')
| -rw-r--r-- | src/nvim/option.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index b48ffae85b..7287db6eb8 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -5175,9 +5175,13 @@ static int put_setstring(FILE *fd, char *cmd, char *name, char_u **valuep, int e * CTRL-V or backslash */ if (valuep == &p_pt) { s = *valuep; - while (*s != NUL) - if (put_escstr(fd, str2special(&s, FALSE), 2) == FAIL) + while (*s != NUL) { + if (put_escstr(fd, (char_u *)str2special((const char **)&s, false, + false), 2) + == FAIL) { return FAIL; + } + } } else if (expand) { buf = xmalloc(MAXPATHL); home_replace(NULL, *valuep, buf, MAXPATHL, FALSE); @@ -6173,15 +6177,16 @@ option_value2string ( } } else { // P_STRING varp = *(char_u **)(varp); - if (varp == NULL) /* just in case */ + if (varp == NULL) { // Just in case. NameBuff[0] = NUL; - else if (opp->flags & P_EXPAND) - home_replace(NULL, varp, NameBuff, MAXPATHL, FALSE); - /* Translate 'pastetoggle' into special key names */ - else if ((char_u **)opp->var == &p_pt) - str2specialbuf(p_pt, NameBuff, MAXPATHL); - else + } else if (opp->flags & P_EXPAND) { + home_replace(NULL, varp, NameBuff, MAXPATHL, false); + // Translate 'pastetoggle' into special key names. + } else if ((char_u **)opp->var == &p_pt) { + str2specialbuf((const char *)p_pt, (char *)NameBuff, MAXPATHL); + } else { STRLCPY(NameBuff, varp, MAXPATHL); + } } } |