commit 4f68858766b47e31a574a506fe9fafed0e90b672
author Bram Moolenaar <Bram@vim.org> Tue Jul 24 12:34:30 2007 +0000
committer Bram Moolenaar <Bram@vim.org> Tue Jul 24 12:34:30 2007 +0000
tree a5a9012a7b11b3b646c5d6ce1daf73ad48cb788f
parent fe40d1a0b0a2ae22fc8a05746d1f867f752f98d3

updated for version 7.1-036

src/ex_getln.c

diff --git a/src/ex_getln.c b/src/ex_getln.c
index e59eb1b..a5975e9 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -268,7 +268,9 @@
     {
 	xpc.xp_context = ccline.xp_context;
 	xpc.xp_pattern = ccline.cmdbuff;
+# if defined(FEAT_USR_CMDS) && defined(FEAT_CMDL_COMPL)
 	xpc.xp_arg = ccline.xp_arg;
+# endif
     }
 #endif
 
@@ -4151,13 +4153,19 @@
 
 #ifdef FEAT_EVAL
     if (ccline.cmdfirstc == '=')
+    {
+# ifdef FEAT_CMDL_COMPL
 	/* pass CMD_SIZE because there is no real command */
 	set_context_for_expression(xp, str, CMD_SIZE);
+# endif
+    }
     else if (ccline.input_fn)
     {
 	xp->xp_context = ccline.xp_context;
 	xp->xp_pattern = ccline.cmdbuff;
+# if defined(FEAT_USR_CMDS) && defined(FEAT_CMDL_COMPL)
 	xp->xp_arg = ccline.xp_arg;
+# endif
     }
     else
 #endif
@@ -4505,6 +4513,12 @@
     if (xp->xp_context != EXPAND_MENUNAMES && xp->xp_context != EXPAND_MENUS)
 	sort_strings(*file, *num_file);
 
+#ifdef FEAT_CMDL_COMPL
+    /* Reset the variables used for special highlight names expansion, so that
+     * they don't show up when getting normal highlight names by ID. */
+    reset_expand_highlight();
+#endif
+
     return OK;
 }