diff options
| author | ckelsel <ckelsel@hotmail.com> | 2017-10-09 21:17:15 +0800 |
|---|---|---|
| committer | ckelsel <ckelsel@hotmail.com> | 2017-10-10 14:50:13 +0800 |
| commit | d2b0c5838a999483a59953755e8c52507b0420b8 (patch) | |
| tree | 97d44e212a3287b9967f0006cd4d587a77de72cd /src/nvim/option.c | |
| parent | 5d369ad3843bbc0a3541827284f55430ec4f46e4 (diff) | |
| parent | ceb40c0411843b35005f019bf2c61f22572afcdf (diff) | |
| download | rneovim-d2b0c5838a999483a59953755e8c52507b0420b8.tar.gz rneovim-d2b0c5838a999483a59953755e8c52507b0420b8.tar.bz2 rneovim-d2b0c5838a999483a59953755e8c52507b0420b8.zip | |
Merge branch 'master' of github.com:ckelsel/neovim into vim-8.0.0101
Diffstat (limited to 'src/nvim/option.c')
| -rw-r--r-- | src/nvim/option.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index 464a8ca608..f6f334f432 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -2456,8 +2456,8 @@ did_set_string_option ( && (options[opt_idx].flags & P_SECURE)) { errmsg = e_secure; } else if (((options[opt_idx].flags & P_NFNAME) - && vim_strpbrk(*varp, (char_u *)(secure - ? "/\\*?[|;&<>\r\n" : "/\\*?[<>\r\n")) != NULL) + && vim_strpbrk(*varp, (char_u *)(secure ? "/\\*?[|;&<>\r\n" + : "/\\*?[<>\r\n")) != NULL) || ((options[opt_idx].flags & P_NDNAME) && vim_strpbrk(*varp, (char_u *)"*?[|;&<>\r\n") != NULL)) { // Check for a "normal" directory or file name in some options. Disallow a |