patch 9.1.1431: Hit-Enter Prompt when loading session files

Problem:  Hit-Enter Prompt when loading session files
Solution: use set+= for 'shortmess' to keep the existing flags
          (Miguel Barro)

closes: #17445

Signed-off-by: Miguel Barro <miguel.barro@live.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/session.c b/src/session.c
index 56d368ac4588d88f9f5fbd0a0ce19fe427af91ac..6696e3cfa01cc59f8d723df218d84867e67e7eab 100644 (file)
--- a/src/session.c
+++ b/src/session.c
@@ -687,9 +687,9 @@ makeopens(
 
     // set 'shortmess' for the following.  Add the 'A' flag if it was there
     if (put_line(fd, "if &shortmess =~ 'A'") == FAIL
-           || put_line(fd, "  set shortmess=aoOA") == FAIL
+           || put_line(fd, "  set shortmess+=aoOA") == FAIL
            || put_line(fd, "else") == FAIL
-           || put_line(fd, "  set shortmess=aoO") == FAIL
+           || put_line(fd, "  set shortmess+=aoO") == FAIL
            || put_line(fd, "endif") == FAIL)
        goto fail;
 

diff --git a/src/version.c b/src/version.c
index 5630b8ad7f189b883e250bae22fd9c53e01b543b..0df54f29b99ec3bbe1cd25892bfd1abc3a8015d4 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -709,6 +709,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1431,
 /**/
     1430,
 /**/