diff options
author | Bram Moolenaar <Bram@vim.org> | 2012-02-29 13:51:37 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2012-02-29 13:51:37 +0100 |
commit | 7f29f7a2f47160acef0477770d3cebf1357470a8 (patch) | |
tree | 8579bbab75e4214791c100a7c91db82ec863a769 /src/option.c | |
parent | 011a34d77da520b383712dd92b4e63c5fc52d969 (diff) | |
download | vim-git-7f29f7a2f47160acef0477770d3cebf1357470a8.tar.gz |
updated for version 7.3.458v7.3.458
Problem: Crash when calling smsg() during startup.
Solution: Don't use 'shortmess' when it is not set yet.
Diffstat (limited to 'src/option.c')
-rw-r--r-- | src/option.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/option.c b/src/option.c index 0cea5586a..b71830f74 100644 --- a/src/option.c +++ b/src/option.c @@ -10984,7 +10984,8 @@ has_format_option(x) shortmess(x) int x; { - return ( vim_strchr(p_shm, x) != NULL + return p_shm != NULL && + ( vim_strchr(p_shm, x) != NULL || (vim_strchr(p_shm, 'a') != NULL && vim_strchr((char_u *)SHM_A, x) != NULL)); } |