vim: src/ex_docmd.c comparison

comparison src/ex_docmd.c @ 41:f529edb9bab3 v7.0025

updated for version 7.0025

author	vimboss
date	Mon, 27 Dec 2004 21:59:20 +0000
parents	f1d2a58883b9
children	c75153d791d0

comparison

equal deleted inserted replaced

-:f1d2a58883b9
+:f529edb9bab3
 static char_u	*getargcmd __ARGS((char_u **));
 static char_u	*skip_cmd_arg __ARGS((char_u *p, int rembs));
 static int	getargopt __ARGS((exarg_T *eap));
 #ifndef FEAT_QUICKFIX
 # define ex_make		ex_ni
+# define ex_cbuffer		ex_ni
 # define ex_cc			ex_ni
 # define ex_cnext		ex_ni
 # define ex_cfile		ex_ni
 # define qf_list		ex_ni
 # define qf_age			ex_ni
 # define ex_helpgrep		ex_ni
+# define ex_vimgrep		ex_ni
 #endif
 #if !defined(FEAT_QUICKFIX) || !defined(FEAT_WINDOWS)
 # define ex_cclose		ex_ni
 # define ex_copen		ex_ni
 # define ex_cwindow		ex_ni
 if (ga_grow(gap, 1) == FAIL)
 	return FAIL;
 ((wcmd_T *)(gap->ga_data))[gap->ga_len].line = vim_strsave(line);
 ((wcmd_T *)(gap->ga_data))[gap->ga_len].lnum = sourcing_lnum;
 ++gap->ga_len;
---gap->ga_room;
 return OK;
 }
 /*
 * Free the lines stored for a ":while" loop.
 {
 while (gap->ga_len > 0)
 {
 	vim_free(((wcmd_T *)(gap->ga_data))[gap->ga_len - 1].line);
 	--gap->ga_len;
-	++gap->ga_room;
 }
 }
 #endif
 /*
 }
 #endif
 #ifdef FEAT_QUICKFIX
 /*
-* For the :make and :grep commands we insert the 'makeprg'/'grepprg'
+* For the ":make" and ":grep" commands we insert the 'makeprg'/'grepprg'
 * option here, so things like % get expanded.
+* Don't do it when ":vimgrep" is used for ":grep".
 */
-if (ea.cmdidx == CMD_make || ea.cmdidx == CMD_grep
+if ((ea.cmdidx == CMD_make
-						  || ea.cmdidx == CMD_grepadd)
+			 || ea.cmdidx == CMD_grep || ea.cmdidx == CMD_grepadd)
+	    && !grep_internal(&ea))
 {
 	char_u		*new_cmdline;
 	char_u		*program;
 	char_u		*pos;
 	char_u		*ptr;
 separate_nextcmd(eap)
 exarg_T	*eap;
 {
 char_u	*p;
-for (p = eap->arg; *p; ++p)
+p = eap->arg;
+#ifdef FEAT_QUICKFIX
+if (eap->cmdidx == CMD_vimgrep
+	    || eap->cmdidx == CMD_vimgrepadd
+	    || grep_internal(eap))
+{
+	/* Skip over the pattern. */
+	p = skip_regexp(p + 1, *p, TRUE, NULL);
+	if (*p == *eap->arg)
+	    ++p;
+}
+#endif
+for ( ; *p; mb_ptr_adv(p))
 {
 	if (*p == Ctrl_V)
 	{
 	    if (eap->argt & (USECTRLV | XFILE))
 		++p;		/* skip CTRL-V and next char */
 	/* Skip over `=expr` when wildcards are expanded. */
 	else if (p[0] == '`' && p[1] == '=')
 	{
 	    p += 2;
 	    (void)skip_expr(&p);
-	    if (*p == '`')
-		++p;
 	}
 #endif
 	/* Check for '"': start of comment or '|': next command */
 	/* :@" and :*" do not start a comment!
 		eap->nextcmd = check_nextcmd(p);
 		*p = NUL;
 		break;
 	    }
 	}
-#ifdef FEAT_MBYTE
+}
-	else if (has_mbyte)
-	    p += (*mb_ptr2len_check)(p) - 1; /* skip bytes of multi-byte char */
-#endif
-}
 if (!(eap->argt & NOTRLCOM))	/* remove trailing spaces */
 	del_trailing_spaces(eap->arg);
 }
 /*
 	cmd = USER_CMD_GA(gap, i);
 	mch_memmove(cmd + 1, cmd, (gap->ga_len - i) * sizeof(ucmd_T));
 	++gap->ga_len;
-	--gap->ga_room;
 	cmd->uc_name = p;
 }
 cmd->uc_rep = rep_buf;
 # if defined(FEAT_EVAL) && defined(FEAT_CMDL_COMPL)
 vim_free(cmd->uc_compl_arg);
 # endif
 --gap->ga_len;
-++gap->ga_room;
 if (i < gap->ga_len)
 	mch_memmove(cmd, cmd + 1, (gap->ga_len - i) * sizeof(ucmd_T));
 }
 }
 /*
 * Set up the new argument list.
 */
-alist_set(ALIST(curwin), filec, filev, FALSE);
+alist_set(ALIST(curwin), filec, filev, FALSE, NULL, 0);
 /*
 * Move to the first file.
 */
 /* Fake up a minimal "next" command for do_argfile() */
 #endif
 #if (!defined(UNIX) && !defined(__EMX__)) || defined(ARCHIE) || defined(PROTO)
 /*
 * Expand the file names in the global argument list.
+* If "fnum_list" is not NULL, use "fnum_list[fnum_len]" as a list of buffer
+* numbers to be re-used.
 */
 void
-alist_expand()
+alist_expand(fnum_list, fnum_len)
+int		*fnum_list;
+int		fnum_len;
 {
 char_u	**old_arg_files;
+int		old_arg_count;
 char_u	**new_arg_files;
 int		new_arg_file_count;
 char_u	*save_p_su = p_su;
 int		i;
 p_su = empty_option;
 old_arg_files = (char_u **)alloc((unsigned)(sizeof(char_u *) * GARGCOUNT));
 if (old_arg_files != NULL)
 {
 	for (i = 0; i < GARGCOUNT; ++i)
-	    old_arg_files[i] = GARGLIST[i].ae_fname;
+	    old_arg_files[i] = vim_strsave(GARGLIST[i].ae_fname);
-	if (expand_wildcards(GARGCOUNT, old_arg_files,
+	old_arg_count = GARGCOUNT;
+	if (expand_wildcards(old_arg_count, old_arg_files,
 		    &new_arg_file_count, &new_arg_files,
 		    EW_FILE|EW_NOTFOUND|EW_ADDSLASH) == OK
 		&& new_arg_file_count > 0)
 	{
-	    alist_set(&global_alist, new_arg_file_count, new_arg_files, TRUE);
+	    alist_set(&global_alist, new_arg_file_count, new_arg_files,
-	    vim_free(old_arg_files);
+						   TRUE, fnum_list, fnum_len);
+	    FreeWild(old_arg_count, old_arg_files);
 	}
 }
 p_su = save_p_su;
 }
 #endif
 /*
 * Set the argument list for the current window.
 * Takes over the allocated files[] and the allocated fnames in it.
 */
 void
-alist_set(al, count, files, use_curbuf)
+alist_set(al, count, files, use_curbuf, fnum_list, fnum_len)
 alist_T	*al;
 int		count;
 char_u	**files;
 int		use_curbuf;
+int		*fnum_list;
+int		fnum_len;
 {
 int		i;
 alist_clear(al);
 if (ga_grow(&al->al_ga, count) == OK)
 		 * interrupting here. */
 		while (i < count)
 		    vim_free(files[i++]);
 		break;
 	    }
+	    /* May set buffer name of a buffer previously used for the
+	     * argument list, so that it's re-used by alist_add. */
+	    if (fnum_list != NULL && i < fnum_len)
+		buf_set_name(fnum_list[i], files[i]);
 	    alist_add(al, files[i], use_curbuf ? 2 : 1);
 	    ui_breakcheck();
 	}
 	vim_free(files);
 }
 AARGLIST(al)[al->al_ga.ga_len].ae_fname = fname;
 if (set_fnum > 0)
 	AARGLIST(al)[al->al_ga.ga_len].ae_fnum =
 	    buflist_add(fname, BLN_LISTED | (set_fnum == 2 ? BLN_CURBUF : 0));
 ++al->al_ga.ga_len;
---al->al_ga.ga_room;
 }
 #if defined(BACKSLASH_IN_FILENAME) || defined(PROTO)
 /*
 * Adjust slashes in file names.  Called after 'shellslash' was set.

Mercurial > vim

comparison src/ex_docmd.c @ 41:f529edb9bab3 v7.0025