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 | 03e50b9fcfeeb1fb23491c0dba95db1062fd4a3e (patch) | |
| tree | 78a79e604809262c2e0a7e4a08c1ac692dd151f6 | |
| parent | 6a3ec1b95de168395fedfc12da7eea0cd461efde (diff) | |
| download | vim-03e50b9fcfeeb1fb23491c0dba95db1062fd4a3e.tar.gz | |
Problem: Crash when calling smsg() during startup.
Solution: Don't use 'shortmess' when it is not set yet.
| -rw-r--r-- | src/option.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/option.c b/src/option.c index 0cea5586..b71830f7 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)); } diff --git a/src/version.c b/src/version.c index 83965f44..49e6515a 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 458, +/**/ 457, /**/ 456, |