Mercurial > vim

comparison src/ex_getln.c @ 1621:82b5078be2dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.2a
author vimboss
date Tue, 24 Jun 2008 21:56:24 +0000
parents 3c251a30c8cc
children 7015ddf81055
comparison
equal deleted inserted replaced
1620:73fe8baea242 1621:82b5078be2dd
531 c = p_wc; 531 c = p_wc;
532 xpc.xp_context = EXPAND_NOTHING; 532 xpc.xp_context = EXPAND_NOTHING;
533 } 533 }
534 } 534 }
535 if ((xpc.xp_context == EXPAND_FILES 535 if ((xpc.xp_context == EXPAND_FILES
536 || xpc.xp_context == EXPAND_DIRECTORIES
536 || xpc.xp_context == EXPAND_SHELLCMD) && p_wmnu) 537 || xpc.xp_context == EXPAND_SHELLCMD) && p_wmnu)
537 { 538 {
538 char_u upseg[5]; 539 char_u upseg[5];
539 540
540 upseg[0] = PATHSEP; 541 upseg[0] = PATHSEP;
4352 { 4353 {
4353 if (xp->xp_backslash == XP_BS_THREE 4354 if (xp->xp_backslash == XP_BS_THREE
4354 && pat[i + 1] == '\\' 4355 && pat[i + 1] == '\\'
4355 && pat[i + 2] == '\\' 4356 && pat[i + 2] == '\\'
4356 && pat[i + 3] == ' ') 4357 && pat[i + 3] == ' ')
4357 mch_memmove(pat + i, pat + i + 3, 4358 STRMOVE(pat + i, pat + i + 3);
4358 STRLEN(pat + i + 3) + 1);
4359 if (xp->xp_backslash == XP_BS_ONE 4359 if (xp->xp_backslash == XP_BS_ONE
4360 && pat[i + 1] == ' ') 4360 && pat[i + 1] == ' ')
4361 mch_memmove(pat + i, pat + i + 1, STRLEN(pat + i)); 4361 STRMOVE(pat + i, pat + i + 1);
4362 } 4362 }
4363 } 4363 }
4364 4364
4365 if (xp->xp_context == EXPAND_FILES) 4365 if (xp->xp_context == EXPAND_FILES)
4366 flags |= EW_FILE; 4366 flags |= EW_FILE;
4599 /* for ":set path=" and ":set tags=" halve backslashes for escaped 4599 /* for ":set path=" and ":set tags=" halve backslashes for escaped
4600 * space */ 4600 * space */
4601 pat = vim_strsave(filepat); 4601 pat = vim_strsave(filepat);
4602 for (i = 0; pat[i]; ++i) 4602 for (i = 0; pat[i]; ++i)
4603 if (pat[i] == '\\' && pat[i + 1] == ' ') 4603 if (pat[i] == '\\' && pat[i + 1] == ' ')
4604 mch_memmove(pat + i, pat + i + 1, STRLEN(pat + i)); 4604 STRMOVE(pat + i, pat + i + 1);
4605 4605
4606 flags |= EW_FILE | EW_EXEC; 4606 flags |= EW_FILE | EW_EXEC;
4607 4607
4608 /* For an absolute name we don't use $PATH. */ 4608 /* For an absolute name we don't use $PATH. */
4609 if (mch_isFullName(pat)) 4609 if (mch_isFullName(pat))
4652 { 4652 {
4653 s = (*file)[i]; 4653 s = (*file)[i];
4654 if (STRLEN(s) > l) 4654 if (STRLEN(s) > l)
4655 { 4655 {
4656 /* Remove the path again. */ 4656 /* Remove the path again. */
4657 mch_memmove(s, s + l, STRLEN(s + l) + 1); 4657 STRMOVE(s, s + l);
4658 ((char_u **)ga.ga_data)[ga.ga_len++] = s; 4658 ((char_u **)ga.ga_data)[ga.ga_len++] = s;
4659 } 4659 }
4660 else 4660 else
4661 vim_free(s); 4661 vim_free(s);
4662 } 4662 }
5533 break; 5533 break;
5534 ++p; 5534 ++p;
5535 for (i = 0; p[i] && !vim_iswhite(p[i]); ++i) 5535 for (i = 0; p[i] && !vim_iswhite(p[i]); ++i)
5536 if (p[i] == '\\' && p[i + 1]) 5536 if (p[i] == '\\' && p[i + 1])
5537 ++i; 5537 ++i;
5538 mch_memmove(p, p + i, STRLEN(p + i) + 1); 5538 STRMOVE(p, p + i);
5539 --p; 5539 --p;
5540 } 5540 }
5541 } 5541 }
5542 #endif 5542 #endif
5543 5543
6002 if (cmdwin_type == NUL) 6002 if (cmdwin_type == NUL)
6003 cmdwin_type = '-'; 6003 cmdwin_type = '-';
6004 6004
6005 /* Create the command-line buffer empty. */ 6005 /* Create the command-line buffer empty. */
6006 (void)do_ecmd(0, NULL, NULL, NULL, ECMD_ONE, ECMD_HIDE); 6006 (void)do_ecmd(0, NULL, NULL, NULL, ECMD_ONE, ECMD_HIDE);
6007 (void)setfname(curbuf, (char_u *)"command-line", NULL, TRUE); 6007 (void)setfname(curbuf, (char_u *)"[Command Line]", NULL, TRUE);
6008 set_option_value((char_u *)"bt", 0L, (char_u *)"nofile", OPT_LOCAL); 6008 set_option_value((char_u *)"bt", 0L, (char_u *)"nofile", OPT_LOCAL);
6009 set_option_value((char_u *)"swf", 0L, NULL, OPT_LOCAL); 6009 set_option_value((char_u *)"swf", 0L, NULL, OPT_LOCAL);
6010 curbuf->b_p_ma = TRUE; 6010 curbuf->b_p_ma = TRUE;
6011 # ifdef FEAT_RIGHTLEFT 6011 # ifdef FEAT_RIGHTLEFT
6012 curwin->w_p_rl = cmdmsg_rl; 6012 curwin->w_p_rl = cmdmsg_rl;