updated for version 7.3.458

Problem:    Crash when calling smsg() during startup.
Solution:   Don't use 'shortmess' when it is not set yet.

diff --git a/src/option.c b/src/option.c
index 0cea5586a809d02e6399f9b47bd524fbb9348b34..b71830f743bdb9012c4e056b902a3c87ec3e622d 100644 (file)
--- 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 83965f44e2a7f0b2bb1dad365bb845167d6c0c37..49e6515a1fa1cd6a86393257160ed5e39b07f1f8 100644 (file)
--- 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,
 /**/