RemoteEditor/vim7: src/ex_docmd.c comparison

comparison src/ex_docmd.c @ 8:f21b6f345e69 v7_2

*** empty log message ***

author	axmo
date	Wed, 13 Aug 2008 17:54:25 +0900
parents	beaeafecd1cd
children	13f0cd4d1b23

comparison

equal deleted inserted replaced

-:95054589743a
+:f21b6f345e69
 /*
 * ex_docmd.c: functions for executing an Ex command line.
 */
 #include "vim.h"
-#include "reditor.h"  /* REP: for Remote Editor */
-#ifdef HAVE_FCNTL_H
-# include <fcntl.h>	    /* for chdir() */
-#endif
 static int	quitmore = 0;
 static int	ex_pressedreturn = FALSE;
 #ifndef FEAT_PRINTER
 # define ex_hardcopy	ex_ni
 # define ex_return		ex_ni
 #endif
 static char_u	*arg_all __ARGS((void));
 #ifdef FEAT_SESSION
 static int	makeopens __ARGS((FILE *fd, char_u *dirnow));
-static int	put_view __ARGS((FILE *fd, win_T *wp, int add_edit, unsigned *flagp));
+static int	put_view __ARGS((FILE *fd, win_T *wp, int add_edit, unsigned *flagp, int current_arg_idx));
 static void	ex_loadview __ARGS((exarg_T *eap));
 static char_u	*get_view_file __ARGS((int c));
 static int	did_lcd;	/* whether ":lcd" was produced for a session */
 #else
 # define ex_loadview		ex_ni
 #endif
 #ifndef FEAT_PROFILE
 # define ex_profile		ex_ni
 #endif
-/*
-* REP: commands for Remote Editor
-*/
-static void	ex_repstart __ARGS((exarg_T *eap));
-static void	ex_repend __ARGS((exarg_T *eap));
 /*
 * Declare cmdnames[].
 */
 #define DO_DECLARE_EXCMD
 	    else
 	    {
 		if (ex_pressedreturn)
 		{
 		    /* go up one line, to overwrite the ":<CR>" line, so the
-		     * output doensn't contain empty lines. */
+		     * output doesn't contain empty lines. */
 		    msg_row = prev_msg_row;
 		    if (prev_msg_row == Rows - 1)
 			msg_row--;
 		}
 		msg_col = 0;
 	}
 	else
 	{
 	    /* need to copy the command after the '|' to cmdline_copy, for the
 	     * next do_one_cmd() */
-	    mch_memmove(cmdline_copy, next_cmdline, STRLEN(next_cmdline) + 1);
+	    STRMOVE(cmdline_copy, next_cmdline);
 	    next_cmdline = cmdline_copy;
 	}
 #ifdef FEAT_EVAL
 	    ea.cmd = (char_u *)"+";
 	    ex_pressedreturn = TRUE;
 	}
 	/* ignore comment and empty lines */
-	if (*ea.cmd == '"' || *ea.cmd == NUL)
+	if (*ea.cmd == '"')
+	    goto doend;
+	if (*ea.cmd == NUL)
 	{
 	    ex_pressedreturn = TRUE;
 	    goto doend;
 	}
 	goto doend;
 }
 #endif
-if (*p == '!' && ea.cmdidx != CMD_substitute)    /* forced commands */
+/* forced commands */
+if (*p == '!' && ea.cmdidx != CMD_substitute
+	    && ea.cmdidx != CMD_smagic && ea.cmdidx != CMD_snomagic)
 {
 	++p;
 	ea.forceit = TRUE;
 }
 else
 	     * with a backslash.  This makes it impossible to end a shell
 	     * command in a backslash, but that doesn't appear useful.
 	     * Halving the number of backslashes is incompatible with previous
 	     * versions. */
 	    if (*p == '\\' && p[1] == '\n')
-		mch_memmove(p, p + 1, STRLEN(p));
+		STRMOVE(p, p + 1);
 	    else if (*p == '\n')
 	    {
 		ea.nextcmd = p + 1;
 		*p = NUL;
 		break;
 	    {
 		STRCPY(IObuff, errormsg);
 		errormsg = IObuff;
 	    }
 	    STRCAT(errormsg, ": ");
-	    STRNCAT(errormsg, *cmdlinep, IOSIZE - STRLEN(IObuff));
+	    STRNCAT(errormsg, *cmdlinep, IOSIZE - STRLEN(IObuff) - 1);
 	}
 	emsg(errormsg);
 }
 #ifdef FEAT_EVAL
 do_errthrow(cstack,
 char_u	*p;
 int		i;
 /*
 * Isolate the command and search for it in the command table.
-* Exeptions:
+* Exceptions:
 * - the 'k' command can directly be followed by any character.
 * - the 's' command can be followed directly by 'c', 'g', 'i', 'I' or 'r'
 *	    but :sre[wind] is another command, as are :scrip[tnames],
 *	    :scs[cope], :sim[alt], :sig[ns] and :sil[ent].
 * - the "d" command can directly be followed by 'l' or 'p' flag.
 return p;
 }
 #endif
 #if defined(FEAT_EVAL) || defined(PROTO)
+static struct cmdmod
+{
+char	*name;
+int		minlen;
+int		has_count;  /* :123verbose  :3tab */
+} cmdmods[] = {
+{"aboveleft", 3, FALSE},
+{"belowright", 3, FALSE},
+{"botright", 2, FALSE},
+{"browse", 3, FALSE},
+{"confirm", 4, FALSE},
+{"hide", 3, FALSE},
+{"keepalt", 5, FALSE},
+{"keepjumps", 5, FALSE},
+{"keepmarks", 3, FALSE},
+{"leftabove", 5, FALSE},
+{"lockmarks", 3, FALSE},
+{"rightbelow", 6, FALSE},
+{"sandbox", 3, FALSE},
+{"silent", 3, FALSE},
+{"tab", 3, TRUE},
+{"topleft", 2, FALSE},
+{"verbose", 4, TRUE},
+{"vertical", 4, FALSE},
+};
+/*
+* Return length of a command modifier (including optional count).
+* Return zero when it's not a modifier.
+*/
+int
+modifier_len(cmd)
+char_u	*cmd;
+{
+int		i, j;
+char_u	*p = cmd;
+if (VIM_ISDIGIT(*cmd))
+	p = skipwhite(skipdigits(cmd));
+for (i = 0; i < sizeof(cmdmods) / sizeof(struct cmdmod); ++i)
+{
+	for (j = 0; p[j] != NUL; ++j)
+	    if (p[j] != cmdmods[i].name[j])
+		break;
+	if (!isalpha(p[j]) && j >= cmdmods[i].minlen
+					&& (p == cmd || cmdmods[i].has_count))
+	    return j + (int)(p - cmd);
+}
+return 0;
+}
 /*
 * Return > 0 if an Ex command "name" exists.
 * Return 2 if there is an exact match.
 * Return 3 if there is an ambiguous match.
 */
 exarg_T	ea;
 int		full = FALSE;
 int		i;
 int		j;
 char_u	*p;
-static struct cmdmod
-{
-	char	*name;
-	int	minlen;
-} cmdmods[] = {
-	{"aboveleft", 3},
-	{"belowright", 3},
-	{"botright", 2},
-	{"browse", 3},
-	{"confirm", 4},
-	{"hide", 3},
-	{"keepalt", 5},
-	{"keepjumps", 5},
-	{"keepmarks", 3},
-	{"leftabove", 5},
-	{"lockmarks", 3},
-	{"rightbelow", 6},
-	{"sandbox", 3},
-	{"silent", 3},
-	{"tab", 3},
-	{"topleft", 2},
-	{"verbose", 4},
-	{"vertical", 4},
-};
 /* Check command modifiers. */
 for (i = 0; i < sizeof(cmdmods) / sizeof(struct cmdmod); ++i)
 {
 	for (j = 0; name[j] != NUL; ++j)
 		    xp->xp_pattern = p;
 		    bow = p + 1;
 		}
 		in_quote = !in_quote;
 	    }
+	    /* An argument can contain just about everything, except
+	     * characters that end the command and white space. */
+	    else if (c == '|' || c == '\n' || c == '"' || (vim_iswhite(c)
 #ifdef SPACE_IN_FILENAME
-	    else if (!vim_isfilec_or_wc(c)
+					 && (!(ea.argt & NOSPC) || usefilter)
-					 && (!(ea.argt & NOSPC) || usefilter))
+#endif
-#else
+		    ))
-	    else if (!vim_isfilec_or_wc(c))
-#endif
 	    {
+		len = 0;  /* avoid getting stuck when space is in 'isfname' */
 		while (*p != NUL)
 		{
 #ifdef FEAT_MBYTE
 		    if (has_mbyte)
 			c = mb_ptr2char(p);
 	case CMD_tab:
 	case CMD_topleft:
 	case CMD_verbose:
 	case CMD_vertical:
 	case CMD_windo:
-	/* REP: for Remote Editor */
-	case CMD_repstart:
-	case CMD_repend:
 	    return arg;
 #ifdef FEAT_CMDL_COMPL
 # ifdef FEAT_SEARCH_EXTRA
 	case CMD_match:
 				curwin->w_cursor.col = MAXCOL;
 			    else
 				curwin->w_cursor.col = 0;
 			    searchcmdlen = 0;
 			    if (!do_search(NULL, c, cmd, 1L,
-				      SEARCH_HIS + SEARCH_MSG + SEARCH_START))
+					       SEARCH_HIS | SEARCH_MSG, NULL))
 			    {
 				curwin->w_cursor = pos;
 				cmd = NULL;
 				goto error;
 			    }
 				pos.col = MAXCOL;
 			    else
 				pos.col = 0;
 			    if (searchit(curwin, curbuf, &pos,
 					*cmd == '?' ? BACKWARD : FORWARD,
-					(char_u *)"", 1L,
+					(char_u *)"", 1L, SEARCH_MSG,
-					SEARCH_MSG + SEARCH_START,
+						i, (linenr_T)0, NULL) != FAIL)
-						      i, (linenr_T)0) != FAIL)
 				lnum = pos.lnum;
 			    else
 			    {
 				cmd = NULL;
 				goto error;
 	{
 	    if (eap->argt & (USECTRLV | XFILE))
 		++p;		/* skip CTRL-V and next char */
 	    else
 				/* remove CTRL-V and skip next char */
-		mch_memmove(p, p + 1, STRLEN(p));
+		STRMOVE(p, p + 1);
 	    if (*p == NUL)		/* stop at NUL after CTRL-V */
 		break;
 	}
 #ifdef FEAT_EVAL
 	     * AND 'b' is present in 'cpoptions'.
 	     */
 	    if ((vim_strchr(p_cpo, CPO_BAR) == NULL
 			      || !(eap->argt & USECTRLV)) && *(p - 1) == '\\')
 	    {
-		mch_memmove(p - 1, p, STRLEN(p) + 1);	/* remove the '\' */
+		STRMOVE(p - 1, p);	/* remove the '\' */
 		--p;
 	    }
 	    else
 	    {
 		eap->nextcmd = check_nextcmd(p);
 while (*p && !vim_isspace(*p))
 {
 	if (*p == '\\' && p[1] != NUL)
 	{
 	    if (rembs)
-		mch_memmove(p, p + 1, STRLEN(p));
+		STRMOVE(p, p + 1);
 	    else
 		++p;
 	}
 	mb_ptr_adv(p);
 }
 * functions in this file.
 *
 * The list should be allocated using alloc(), as should each item in the
 * list. This function takes over responsibility for freeing the list.
 *
-* XXX The list is made into the arggument list. This is freed using
+* XXX The list is made into the argument list. This is freed using
 * FreeWild(), which does a series of vim_free() calls, unless the two defines
 * __EMX__ and __ALWAYS_HAS_TRAILING_NUL_POINTER are set. In this case, a
 * routine _fnexplodefree() is used. This may cause problems, but as the drop
 * file functionality is (currently) not in EMX this is not presently a
 * problem.
 	return;
 #ifdef FEAT_AUTOCMD
 if (curbuf_locked())
 	return;
 #endif
+/* When the screen is being updated we should not change buffers and
+* windows structures, it may cause freed memory to be used. */
+if (updating_screen)
+	return;
 /* Check whether the current buffer is changed. If so, we will need
 * to split the current window or data could be lost.
 * We don't need to check if the 'hidden' option is set, as in this
 * case the buffer won't be lost.
 need_mouse_correct = TRUE;
 # endif
 # ifdef FEAT_QUICKFIX
 /* A ":split" in the quickfix window works like ":new".  Don't want two
-* quickfix windows. */
+* quickfix windows.  But it's OK when doing ":tab split". */
-if (bt_quickfix(curbuf))
+if (bt_quickfix(curbuf) && cmdmod.tab == 0)
 {
 	if (eap->cmdidx == CMD_split)
 	    eap->cmdidx = CMD_new;
 #  ifdef FEAT_VERTSPLIT
 	if (eap->cmdidx == CMD_vsplit)
 #  ifdef FEAT_VERTSPLIT
 	    && eap->cmdidx != CMD_vnew
 # endif
 	    && eap->cmdidx != CMD_new)
 {
+# ifdef FEAT_AUTOCMD
 	if (
-# ifdef FEAT_GUI
+#  ifdef FEAT_GUI
 	    !gui.in_use &&
-# endif
+#  endif
 		au_has_group((char_u *)"FileExplorer"))
 	{
 	    /* No browsing supported but we do have the file explorer:
 	     * Edit the directory. */
 	    if (*eap->arg == NUL || !mch_isdir(eap->arg))
 		eap->arg = (char_u *)".";
 	}
 	else
+# endif
 	{
 	    fname = do_browse(0, (char_u *)_("Edit File in new window"),
 					  eap->arg, NULL, NULL, NULL, curbuf);
 	    if (fname == NULL)
 		goto theend;
 {
 	if (win_new_tabpage(cmdmod.tab != 0 ? cmdmod.tab
 			 : eap->addr_count == 0 ? 0
 					       : (int)eap->line2 + 1) != FAIL)
 	{
-	    do_exedit(eap, NULL);
+	    do_exedit(eap, old_curwin);
 	    /* set the alternate buffer for the window we came from */
 	    if (curwin != old_curwin
 		    && win_valid(old_curwin)
 		    && old_curwin->w_buffer != curbuf
 theend:
 vim_free(fname);
 # endif
 }
-#if defined(FEAT_MOUSE) || defined(PROTO)
 /*
 * Open a new tab page.
 */
 void
 tabpage_new()
 ea.cmdidx = CMD_tabnew;
 ea.cmd = (char_u *)"tabn";
 ea.arg = (char_u *)"";
 ex_splitview(&ea);
 }
-#endif
 /*
 * :tabnext command
 */
 static void
 #if defined(EXITFREE) || defined(PROTO)
 void
 free_cd_dir()
 {
 vim_free(prev_dir);
+prev_dir = NULL;
 }
 #endif
 /*
 #endif
 {
 	if (vim_strchr(p_cpo, CPO_CHDIR) != NULL && curbufIsChanged()
 							     && !eap->forceit)
 	{
-	    EMSG(_("E747: Cannot change directory, buffer is modifed (add ! to override)"));
+	    EMSG(_("E747: Cannot change directory, buffer is modified (add ! to override)"));
 	    return;
 	}
 	/* ":cd -": Change to previous directory */
 	if (STRCMP(new_dir, "-") == 0)
 		    shorten_fnames(TRUE);
 		}
 	    }
 	    else
 	    {
-		failed |= (put_view(fd, curwin, !using_vdir, flagp) == FAIL);
+		failed |= (put_view(fd, curwin, !using_vdir, flagp,
+								 -1) == FAIL);
 	    }
 	    if (put_line(fd, "let &so = s:so_save | let &siso = s:siso_save")
 								      == FAIL)
 		failed = TRUE;
 	    if (put_line(fd, "doautoall SessionLoadPost") == FAIL)
 int		save_msg_didout = msg_didout;
 int		save_State = State;
 tasave_T	tabuf;
 int		save_insertmode = p_im;
 int		save_finish_op = finish_op;
+int		save_opcount = opcount;
 #ifdef FEAT_MBYTE
 char_u	*arg = NULL;
 int		l;
 char_u	*p;
 #endif
 --ex_normal_busy;
 msg_scroll = save_msg_scroll;
 restart_edit = save_restart_edit;
 p_im = save_insertmode;
 finish_op = save_finish_op;
+opcount = save_opcount;
 msg_didout |= save_msg_didout;	/* don't reset msg_didout now */
 /* Restore the state (needed when called from a function executed for
 * 'indentexpr'). */
 State = save_State;
 		  break;
 	case 'l': cmd = DT_LAST;	/* ":tlast" */
 		  break;
 	default:			/* ":tag" */
 #ifdef FEAT_CSCOPE
-		  if (p_cst)
+		  if (p_cst && *eap->arg != NUL)
 		  {
 		      do_cstag(eap);
 		      return;
 		  }
 #endif
 do_tag(eap->arg, cmd, eap->addr_count > 0 ? (int)eap->line2 : 1,
 							  eap->forceit, TRUE);
 }
 /*
-* Evaluate cmdline variables.
+* Check "str" for starting with a special cmdline variable.
-*
+* If found return one of the SPEC_ values and set "*usedlen" to the length of
-* change '%'	    to curbuf->b_ffname
+* the variable.  Otherwise return -1 and "*usedlen" is unchanged.
-*	  '#'	    to curwin->w_altfile
+*/
-*	  '<cword>' to word under the cursor
+int
-*	  '<cWORD>' to WORD under the cursor
+find_cmdline_var(src, usedlen)
-*	  '<cfile>' to path name under the cursor
+char_u	*src;
-*	  '<sfile>' to sourced file name
+int		*usedlen;
-*	  '<afile>' to file name for autocommand
+{
-*	  '<abuf>'  to buffer number for autocommand
+int		len;
-*	  '<amatch>' to matching name for autocommand
-*
-* When an error is detected, "errormsg" is set to a non-NULL pointer (may be
-* "" for error without a message) and NULL is returned.
-* Returns an allocated string if a valid match was found.
-* Returns NULL if no match was found.	"usedlen" then still contains the
-* number of characters to skip.
-*/
-char_u *
-eval_vars(src, srcstart, usedlen, lnump, errormsg, escaped)
-char_u	*src;		/* pointer into commandline */
-char_u	*srcstart;	/* beginning of valid memory for src */
-int		*usedlen;	/* characters after src that are used */
-linenr_T	*lnump;		/* line number for :e command, or NULL */
-char_u	**errormsg;	/* pointer to error message */
-int		*escaped;	/* return value has escaped white space (can
-				 * be NULL) */
-{
 int		i;
-char_u	*s;
+static char *(spec_str[]) = {
-char_u	*result;
-char_u	*resultbuf = NULL;
-int		resultlen;
-buf_T	*buf;
-int		valid = VALID_HEAD + VALID_PATH;    /* assume valid result */
-int		spec_idx;
-#ifdef FEAT_MODIFY_FNAME
-int		skip_mod = FALSE;
-#endif
-static char *(spec_str[]) =
-	{
 		    "%",
 #define SPEC_PERC   0
 		    "#",
 #define SPEC_HASH   1
 		    "<cword>",		/* cursor word */
 #endif
 #ifdef FEAT_CLIENTSERVER
 		    "<client>"
 # define SPEC_CLIENT 9
 #endif
-		};
+};
 #define SPEC_COUNT  (sizeof(spec_str) / sizeof(char *))
+for (i = 0; i < SPEC_COUNT; ++i)
+{
+	len = (int)STRLEN(spec_str[i]);
+	if (STRNCMP(src, spec_str[i], len) == 0)
+	{
+	    *usedlen = len;
+	    return i;
+	}
+}
+return -1;
+}
+/*
+* Evaluate cmdline variables.
+*
+* change '%'	    to curbuf->b_ffname
+*	  '#'	    to curwin->w_altfile
+*	  '<cword>' to word under the cursor
+*	  '<cWORD>' to WORD under the cursor
+*	  '<cfile>' to path name under the cursor
+*	  '<sfile>' to sourced file name
+*	  '<afile>' to file name for autocommand
+*	  '<abuf>'  to buffer number for autocommand
+*	  '<amatch>' to matching name for autocommand
+*
+* When an error is detected, "errormsg" is set to a non-NULL pointer (may be
+* "" for error without a message) and NULL is returned.
+* Returns an allocated string if a valid match was found.
+* Returns NULL if no match was found.	"usedlen" then still contains the
+* number of characters to skip.
+*/
+char_u *
+eval_vars(src, srcstart, usedlen, lnump, errormsg, escaped)
+char_u	*src;		/* pointer into commandline */
+char_u	*srcstart;	/* beginning of valid memory for src */
+int		*usedlen;	/* characters after src that are used */
+linenr_T	*lnump;		/* line number for :e command, or NULL */
+char_u	**errormsg;	/* pointer to error message */
+int		*escaped;	/* return value has escaped white space (can
+				 * be NULL) */
+{
+int		i;
+char_u	*s;
+char_u	*result;
+char_u	*resultbuf = NULL;
+int		resultlen;
+buf_T	*buf;
+int		valid = VALID_HEAD + VALID_PATH;    /* assume valid result */
+int		spec_idx;
+#ifdef FEAT_MODIFY_FNAME
+int		skip_mod = FALSE;
+#endif
 #if defined(FEAT_AUTOCMD) || defined(FEAT_CLIENTSERVER)
 char_u	strbuf[30];
 #endif
 	*escaped = FALSE;
 /*
 * Check if there is something to do.
 */
-for (spec_idx = 0; spec_idx < SPEC_COUNT; ++spec_idx)
+spec_idx = find_cmdline_var(src, usedlen);
-{
+if (spec_idx < 0)	/* no match */
-	*usedlen = (int)STRLEN(spec_str[spec_idx]);
-	if (STRNCMP(src, spec_str[spec_idx], *usedlen) == 0)
-	    break;
-}
-if (spec_idx == SPEC_COUNT)	    /* no match */
 {
 	*usedlen = 1;
 	return NULL;
 }
 * Note: In "\\%" the % is also not recognized!
 */
 if (src > srcstart && src[-1] == '\\')
 {
 	*usedlen = 0;
-	STRCPY(src - 1, src);		/* remove backslash */
+	STRMOVE(src - 1, src);	/* remove backslash */
 	return NULL;
 }
 /*
 * word or WORD under cursor
 		if (result == NULL)
 		{
 		    *errormsg = (char_u *)_("E495: no autocommand file name to substitute for \"<afile>\"");
 		    return NULL;
 		}
+		result = shorten_fname1(result);
 		break;
 	case SPEC_ABUF:		/* buffer number for autocommand */
 		if (autocmd_bufnr <= 0)
 		{
 char_u	*sname;
 win_T	*edited_win = NULL;
 int		tabnr;
 win_T	*tab_firstwin;
 frame_T	*tab_topframe;
+int		cur_arg_idx = 0;
+int		next_arg_idx = 0;
 if (ssop_flags & SSOP_BUFFERS)
 	only_save_windows = FALSE;		/* Save ALL buffers */
 /*
 	 */
 	for (wp = tab_firstwin; wp != NULL; wp = wp->w_next)
 	{
 	    if (!ses_do_win(wp))
 		continue;
-	    if (put_view(fd, wp, wp != edited_win, &ssop_flags) == FAIL)
+	    if (put_view(fd, wp, wp != edited_win, &ssop_flags,
+							 cur_arg_idx) == FAIL)
 		return FAIL;
 	    if (nr > 1 && put_line(fd, "wincmd w") == FAIL)
 		return FAIL;
-	}
+	    next_arg_idx = wp->w_arg_idx;
+	}
+	/* The argument index in the first tab page is zero, need to set it in
+	 * each window.  For further tab pages it's the window where we do
+	 * "tabedit". */
+	cur_arg_idx = next_arg_idx;
 	/*
 	 * Restore cursor to the current window if it's not the first one.
 	 */
 	if (cnr > 1 && (fprintf(fd, "%dwincmd w", cnr) < 0
 /*
 * Write commands to "fd" to restore the view of a window.
 * Caller must make sure 'scrolloff' is zero.
 */
 static int
-put_view(fd, wp, add_edit, flagp)
+put_view(fd, wp, add_edit, flagp, current_arg_idx)
 FILE	*fd;
 win_T	*wp;
 int		add_edit;	/* add ":edit" command to view */
 unsigned	*flagp;		/* vop_flags or ssop_flags */
+int		current_arg_idx; /* current argument index of the window, use
+				  * -1 if unknown */
 {
 win_T	*save_curwin;
 int		f;
 int		do_cursor;
 int		did_next = FALSE;
 	    return FAIL;
 }
 /* Only when part of a session: restore the argument index.  Some
 * arguments may have been deleted, check if the index is valid. */
-if (wp->w_arg_idx != 0 && wp->w_arg_idx <= WARGCOUNT(wp)
+if (wp->w_arg_idx != current_arg_idx && wp->w_arg_idx <= WARGCOUNT(wp)
 						      && flagp == &ssop_flags)
 {
-	if (fprintf(fd, "%ldnext", (long)wp->w_arg_idx) < 0
+	if (fprintf(fd, "%ldargu", (long)wp->w_arg_idx + 1) < 0
 		|| put_eol(fd) == FAIL)
 	    return FAIL;
 	did_next = TRUE;
 }
 /* Execute the command on the marked lines. */
 global_exe(eap->arg);
 ml_clearmarked();	   /* clear rest of the marks */
 }
 #endif
-/*
-* REP: Remote Editor's Ex commands
-*/
-/* start REP mode */
-static void
-ex_repstart(eap)
-exarg_T *eap;
-{
-if (curbuf->b_sfname == NULL) {
-	MSG(_("[REP MODE] start without file"));
-	if (rep_join() == FALSE) {
-	    rep_end();
-	}
-} else {
-	MSG(_("[REP MODE] start with file"));
-	if (rep_put(curbuf->b_sfname) == FALSE) {
-	    rep_end();
-	}
-}
-}
-/* end REP mode */
-static void
-ex_repend(eap)
-exarg_T *eap;
-{
-MSG(_("[REP MODE] end"));
-rep_end();
-}

Mercurial > hg > RemoteEditor > vim7

comparison src/ex_docmd.c @ 8:f21b6f345e69 v7_2