diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-03-02 01:24:38 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-03-02 01:24:38 -0500 |
| commit | 56bfdd79346fd71fb0b587f8183c1cc3a0ddbae1 (patch) | |
| tree | 28c7be449883276c7f3121e0af9ff85e9a7e4901 /src/nvim/option.c | |
| parent | 36cb847d09afc840f9875b93d504650332b623c3 (diff) | |
| parent | 0d6cd2b8087d9ae7fdb2b70fcc40ecaf378b0af7 (diff) | |
| download | rneovim-56bfdd79346fd71fb0b587f8183c1cc3a0ddbae1.tar.gz rneovim-56bfdd79346fd71fb0b587f8183c1cc3a0ddbae1.tar.bz2 rneovim-56bfdd79346fd71fb0b587f8183c1cc3a0ddbae1.zip | |
Merge #4265 'vim-patch:7.4.925'.
Diffstat (limited to 'src/nvim/option.c')
| -rw-r--r-- | src/nvim/option.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index af7b272467..5efd71444a 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -6167,16 +6167,14 @@ int has_format_option(int x) return vim_strchr(curbuf->b_p_fo, x) != NULL; } -/* - * Return TRUE if "x" is present in 'shortmess' option, or - * 'shortmess' contains 'a' and "x" is present in SHM_A. - */ -int shortmess(int x) +/// @returns true if "x" is present in 'shortmess' option, or +/// 'shortmess' contains 'a' and "x" is present in SHM_ALL_ABBREVIATIONS. +bool shortmess(int x) { return p_shm != NULL && - ( vim_strchr(p_shm, x) != NULL - || (vim_strchr(p_shm, 'a') != NULL - && vim_strchr((char_u *)SHM_A, x) != NULL)); + (vim_strchr(p_shm, x) != NULL + || (vim_strchr(p_shm, 'a') != NULL + && vim_strchr((char_u *)SHM_ALL_ABBREVIATIONS, x) != NULL)); } /* |