commit 8cc43daee1f485c9abf1de3c638cce7835b9f861
author zeertzjq <zeertzjq@outlook.com> Sat Dec 07 16:09:08 2024 +0100
committer Christian Brabandt <cb@256bit.org> Sat Dec 07 16:09:08 2024 +0100
tree 92d6cf1f0dea6e6f050e32673524faa9810babc1
parent d9e9f89e0ffd6e7ce5e2a7f8f1ace5471e37c210

patch 9.1.0911: Variable name for 'messagesopt' doesn't match short name

Problem:  Variable name for 'messagesopt' doesn't match short name
          (after v9.1.0908)
Solution: Change p_meo to p_mopt.  Add more details to docs.
          (zeertzjq)

closes: #16182

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

src/message.c

diff --git a/src/message.c b/src/message.c
index 6b994e5..f0d1806 100644
--- a/src/message.c
+++ b/src/message.c
@@ -1093,7 +1093,7 @@
     int		messages_wait_new = 0;
     int		messages_history_new = 0;
 
-    p = p_meo;
+    p = p_mopt;
     while (*p != NUL)
     {
 	if (STRNCMP(p, MESSAGES_OPT_HIT_ENTER,

src/option.h

diff --git a/src/option.h b/src/option.h
index e747add..a3634a6 100644
--- a/src/option.h
+++ b/src/option.h
@@ -775,7 +775,7 @@
 #ifdef FEAT_MENU
 EXTERN long	p_mis;		// 'menuitems'
 #endif
-EXTERN char_u	*p_meo;		// 'messagesopt'
+EXTERN char_u	*p_mopt;	// 'messagesopt'
 #ifdef FEAT_SPELL
 EXTERN char_u	*p_msm;		// 'mkspellmem'
 #endif

src/optiondefs.h

diff --git a/src/optiondefs.h b/src/optiondefs.h
index f42178b..2d01897 100644
--- a/src/optiondefs.h
+++ b/src/optiondefs.h
@@ -1696,7 +1696,7 @@
 			    (char_u *)NULL, PV_NONE, NULL, NULL,
 			    {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
     {"messagesopt","mopt",  P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_COLON|P_NODUP,
-			    (char_u *)&p_meo, PV_NONE, did_set_messagesopt, expand_set_messagesopt,
+			    (char_u *)&p_mopt, PV_NONE, did_set_messagesopt, expand_set_messagesopt,
 			    {(char_u *)"hit-enter,history:500", (char_u *)NULL} SCTX_INIT},
     {"mkspellmem",  "msm",  P_STRING|P_VI_DEF|P_EXPAND|P_SECURE,
 #ifdef FEAT_SPELL

src/optionstr.c

diff --git a/src/optionstr.c b/src/optionstr.c
index 08b2350..9247433 100644
--- a/src/optionstr.c
+++ b/src/optionstr.c
@@ -3055,11 +3055,11 @@
     int
 expand_set_messagesopt(optexpand_T *args, int *numMatches, char_u ***matches)
 {
-    static char *(p_meo_values[]) = {"hit-enter", "wait:", "history:", NULL};
+    static char *(p_mopt_values[]) = {"hit-enter", "wait:", "history:", NULL};
     return expand_set_opt_string(
 	    args,
-	    p_meo_values,
-	    ARRAY_LENGTH(p_meo_values) - 1,
+	    p_mopt_values,
+	    ARRAY_LENGTH(p_mopt_values) - 1,
 	    numMatches,
 	    matches);
 }

src/testdir/test_messages.vim

diff --git a/src/testdir/test_messages.vim b/src/testdir/test_messages.vim
index 1b5f809..2dce6c6 100644
--- a/src/testdir/test_messages.vim
+++ b/src/testdir/test_messages.vim
@@ -692,12 +692,12 @@
 
   " Check hit-enter prompt
   call term_sendkeys(buf, ":set messagesopt=hit-enter,history:500\n")
-  call term_sendkeys(buf, ":echo 'foo' | echo 'bar' echo 'baz'\n")
+  call term_sendkeys(buf, ":echo 'foo' | echo 'bar' | echo 'baz'\n")
   call WaitForAssert({-> assert_equal('Press ENTER or type command to continue', term_getline(buf, 6))})
 
   " Check no hit-enter prompt when "wait:" is set
   call term_sendkeys(buf, ":set messagesopt=wait:100,history:500\n")
-  call term_sendkeys(buf, ":echo 'foo' | echo 'bar' echo 'baz'\n")
+  call term_sendkeys(buf, ":echo 'foo' | echo 'bar' | echo 'baz'\n")
   call WaitForAssert({-> assert_equal('                           0,0-1         All', term_getline(buf, 6))})
 
   " clean up

src/version.c

diff --git a/src/version.c b/src/version.c
index 9c29c4e..81ebbae 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    911,
+/**/
     910,
 /**/
     909,