From 7f29f7a2f47160acef0477770d3cebf1357470a8 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar <Bram@vim.org> Date: Wed, 29 Feb 2012 13:51:37 +0100 Subject: [PATCH] updated for version 7.3.458 Problem: Crash when calling smsg() during startup. Solution: Don't use 'shortmess' when it is not set yet. --- src/option.c | 3 ++- src/version.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/option.c b/src/option.c index 0cea5586a8..b71830f743 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 83965f44e2..49e6515a1f 100644 --- a/src/version.c +++ b/src/version.c @@ -714,6 +714,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 458, /**/ 457, /**/ -- GitLab