patch 8.0.0034

Problem:    No completion for ":messages".
Solution:   Complete "clear" argument. (Hirohito Higashi)

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index d4a005ae36b37b90fc7211655cb45306a9ae4720..88599ddecbb1d8071b3e36e2e9f7b496d47b4979 100644 (file)
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -4287,7 +4287,9 @@ getcompletion({pat}, {type} [, {filtered}])               *getcompletion()*
                locale          locale names (as output of locale -a)
                mapping         mapping name
                menu            menus
+               messages        |:messages| suboptions
                option          options
+               packadd         optional package |pack-add| names
                shellcmd        Shell command
                sign            |:sign| suboptions
                syntax          syntax file names |'syntax'|

diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index 7989d645678ede18b43e7f0b0c66c025bf730d19..25ed827a80fd12dbd74b19a7da718158a0b98a57 100644 (file)
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -1280,6 +1280,7 @@ completion can be enabled:
        -complete=locale        locale names (as output of locale -a)
        -complete=mapping       mapping name
        -complete=menu          menus
+       -complete=messages      |:messages| suboptions
        -complete=option        options
        -complete=packadd       optional package |pack-add| names
        -complete=shellcmd      Shell command

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index ac7beb7c5b9966c7bb66f7e99ed6b7a5be7e518f..6802b8b3d7c9b926676c8a74f41b4c69e86cdf3b 100644 (file)
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -4281,6 +4281,11 @@ set_one_cmd_context(
            xp->xp_pattern = arg;
            break;
 
+       case CMD_messages:
+           xp->xp_context = EXPAND_MESSAGES;
+           xp->xp_pattern = arg;
+           break;
+
 #if defined(FEAT_CMDHIST)
        case CMD_history:
            xp->xp_context = EXPAND_HISTORY;
@@ -5893,6 +5898,7 @@ static struct
 #endif
     {EXPAND_MAPPINGS, "mapping"},
     {EXPAND_MENUS, "menu"},
+    {EXPAND_MESSAGES, "messages"},
     {EXPAND_OWNSYNTAX, "syntax"},
 #if defined(FEAT_PROFILE)
     {EXPAND_SYNTIME, "syntime"},
@@ -11901,6 +11907,18 @@ get_behave_arg(expand_T *xp UNUSED, int idx)
        return (char_u *)"xterm";
     return NULL;
 }
+
+/*
+ * Function given to ExpandGeneric() to obtain the possible arguments of the
+ * ":messages {clear}" command.
+ */
+    char_u *
+get_messages_arg(expand_T *xp UNUSED, int idx)
+{
+    if (idx == 0)
+       return (char_u *)"clear";
+    return NULL;
+}
 #endif
 
 #ifdef FEAT_AUTOCMD

diff --git a/src/ex_getln.c b/src/ex_getln.c
index 25a12bed3d006c4eef72cf3d5499c904502b9952..5d098cca3fbfe1cf07d14649c2b46995d65884e3 100644 (file)
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -4832,6 +4832,7 @@ ExpandFromContext(
        {
            {EXPAND_COMMANDS, get_command_name, FALSE, TRUE},
            {EXPAND_BEHAVE, get_behave_arg, TRUE, TRUE},
+           {EXPAND_MESSAGES, get_messages_arg, TRUE, TRUE},
 #ifdef FEAT_CMDHIST
            {EXPAND_HISTORY, get_history_arg, TRUE, TRUE},
 #endif

diff --git a/src/proto/ex_docmd.pro b/src/proto/ex_docmd.pro
index b92ce80d135aa3c8cfdf0f5344ac0ead7033c11c..11a3f71aca600aef0e912eebd62573ddd630449b 100644 (file)
--- a/src/proto/ex_docmd.pro
+++ b/src/proto/ex_docmd.pro
@@ -61,4 +61,5 @@ int put_eol(FILE *fd);
 int put_line(FILE *fd, char *s);
 void dialog_msg(char_u *buff, char *format, char_u *fname);
 char_u *get_behave_arg(expand_T *xp, int idx);
+char_u *get_messages_arg(expand_T *xp, int idx);
 /* vim: set ft=c : */

diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim
index 4bacf5721dd2f7085be6937b555b4ffe547f5194..3718087eb140eed19ed20a1afd273364128537f6 100644 (file)
--- a/src/testdir/test_cmdline.vim
+++ b/src/testdir/test_cmdline.vim
@@ -129,6 +129,11 @@ func Test_getcompletion()
   let l = getcompletion('dark', 'highlight')
   call assert_equal([], l)
 
+  let l = getcompletion('', 'messages')
+  call assert_true(index(l, 'clear') >= 0)
+  let l = getcompletion('not', 'messages')
+  call assert_equal([], l)
+
   if has('cscope')
     let l = getcompletion('', 'cscope')
     let cmds = ['add', 'find', 'help', 'kill', 'reset', 'show']

diff --git a/src/version.c b/src/version.c
index b2066e4e84147d704ded8fe9f6bd9104eb0d6c5c..e803bae4534481798a8945d24b982dd033be25f7 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    34,
 /**/
     33,
 /**/

diff --git a/src/vim.h b/src/vim.h
index a787575b8dd048e0d9dae35ed2f6319e4c3f8521..0ac296e26083b5395748a4f741ca7d566505a0d0 100644 (file)
--- a/src/vim.h
+++ b/src/vim.h
@@ -793,6 +793,7 @@ extern char *(*dyn_libintl_textdomain)(const char *domainname);
 #define EXPAND_SYNTIME         43
 #define EXPAND_USER_ADDR_TYPE  44
 #define EXPAND_PACKADD         45
+#define EXPAND_MESSAGES                46
 
 /* Values for exmode_active (0 is no exmode) */
 #define EXMODE_NORMAL          1