Mercurial > vim

changeset 3384:da670fb71d30 v7.3.458

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.3.458 Problem: Crash when calling smsg() during startup. Solution: Don't use 'shortmess' when it is not set yet.
author Bram Moolenaar <bram@vim.org>
date Wed, 29 Feb 2012 13:51:37 +0100
parents 6b02d47d3a33
children 6832c3e0b70d
files src/option.c src/version.c
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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));
 }
--- 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,