Mercurial > vim

comparison src/ex_getln.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 eb57516376d4
children 417c4d78a09c
comparison
equal deleted inserted replaced
1321:f3d7fa7dcf63 1322:4ce0a7e4c6b3
266 #if defined(FEAT_EVAL) 266 #if defined(FEAT_EVAL)
267 if (ccline.input_fn) 267 if (ccline.input_fn)
268 { 268 {
269 xpc.xp_context = ccline.xp_context; 269 xpc.xp_context = ccline.xp_context;
270 xpc.xp_pattern = ccline.cmdbuff; 270 xpc.xp_pattern = ccline.cmdbuff;
271 # if defined(FEAT_USR_CMDS) && defined(FEAT_CMDL_COMPL)
271 xpc.xp_arg = ccline.xp_arg; 272 xpc.xp_arg = ccline.xp_arg;
273 # endif
272 } 274 }
273 #endif 275 #endif
274 276
275 /* 277 /*
276 * Avoid scrolling when called by a recursive do_cmdline(), e.g. when 278 * Avoid scrolling when called by a recursive do_cmdline(), e.g. when
4149 str[col] = NUL; 4151 str[col] = NUL;
4150 nextcomm = str; 4152 nextcomm = str;
4151 4153
4152 #ifdef FEAT_EVAL 4154 #ifdef FEAT_EVAL
4153 if (ccline.cmdfirstc == '=') 4155 if (ccline.cmdfirstc == '=')
4156 {
4157 # ifdef FEAT_CMDL_COMPL
4154 /* pass CMD_SIZE because there is no real command */ 4158 /* pass CMD_SIZE because there is no real command */
4155 set_context_for_expression(xp, str, CMD_SIZE); 4159 set_context_for_expression(xp, str, CMD_SIZE);
4160 # endif
4161 }
4156 else if (ccline.input_fn) 4162 else if (ccline.input_fn)
4157 { 4163 {
4158 xp->xp_context = ccline.xp_context; 4164 xp->xp_context = ccline.xp_context;
4159 xp->xp_pattern = ccline.cmdbuff; 4165 xp->xp_pattern = ccline.cmdbuff;
4166 # if defined(FEAT_USR_CMDS) && defined(FEAT_CMDL_COMPL)
4160 xp->xp_arg = ccline.xp_arg; 4167 xp->xp_arg = ccline.xp_arg;
4168 # endif
4161 } 4169 }
4162 else 4170 else
4163 #endif 4171 #endif
4164 while (nextcomm != NULL) 4172 while (nextcomm != NULL)
4165 nextcomm = set_one_cmd_context(xp, nextcomm); 4173 nextcomm = set_one_cmd_context(xp, nextcomm);
4503 4511
4504 /* Sort the results. Keep menu's in the specified order. */ 4512 /* Sort the results. Keep menu's in the specified order. */
4505 if (xp->xp_context != EXPAND_MENUNAMES && xp->xp_context != EXPAND_MENUS) 4513 if (xp->xp_context != EXPAND_MENUNAMES && xp->xp_context != EXPAND_MENUS)
4506 sort_strings(*file, *num_file); 4514 sort_strings(*file, *num_file);
4507 4515
4516 #ifdef FEAT_CMDL_COMPL
4517 /* Reset the variables used for special highlight names expansion, so that
4518 * they don't show up when getting normal highlight names by ID. */
4519 reset_expand_highlight();
4520 #endif
4521
4508 return OK; 4522 return OK;
4509 } 4523 }
4510 4524
4511 /* 4525 /*
4512 * Complete a shell command. 4526 * Complete a shell command.