Mercurial > vim

diff src/ex_docmd.c @ 1322:4ce0a7e4c6b3 v7.1.036

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.1-036
author vimboss
date Tue, 24 Jul 2007 12:34:30 +0000
parents 0868e4e53fb2
children 22886f3d882d
line wrap: on
line diff
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -3406,14 +3406,13 @@ set_one_cmd_context(xp, buff)
 	case CMD_windo:
 	    return arg;
 
-#ifdef FEAT_SEARCH_EXTRA
+#ifdef FEAT_CMDL_COMPL
+# ifdef FEAT_SEARCH_EXTRA
 	case CMD_match:
 	    if (*arg == NUL || !ends_excmd(*arg))
 	    {
-		/* Dummy call to clear variables. */
-		set_context_in_highlight_cmd(xp, (char_u *)"link n");
-		xp->xp_context = EXPAND_HIGHLIGHT;
-		xp->xp_pattern = arg;
+		/* also complete "None" */
+		set_context_in_echohl_cmd(xp, arg);
 		arg = skipwhite(skiptowhite(arg));
 		if (*arg != NUL)
 		{
@@ -3422,9 +3421,8 @@ set_one_cmd_context(xp, buff)
 		}
 	    }
 	    return find_nextcmd(arg);
-#endif
-
-#ifdef FEAT_CMDL_COMPL
+# endif
+
 /*
  * All completion for the +cmdline_compl feature goes here.
  */
@@ -3622,8 +3620,7 @@ set_one_cmd_context(xp, buff)
 	    break;
 
 	case CMD_echohl:
-	    xp->xp_context = EXPAND_HIGHLIGHT;
-	    xp->xp_pattern = arg;
+	    set_context_in_echohl_cmd(xp, arg);
 	    break;
 #endif
 	case CMD_highlight: