vim: src/ex_getln.c comparison

comparison src/ex_getln.c @ 95:a2081e6febb8

updated for version 7.0037

author	vimboss
date	Tue, 11 Jan 2005 21:29:04 +0000
parents	388f285bda1b
children	6df0106fc595

comparison

equal deleted inserted replaced

-:0c2e08de4a75
+:a2081e6febb8
 static void	correct_cmdspos __ARGS((int idx, int cells));
 #endif
 static void	alloc_cmdbuff __ARGS((int len));
 static int	realloc_cmdbuff __ARGS((int len));
 static void	draw_cmdline __ARGS((int start, int len));
+static void	save_cmdline __ARGS((struct cmdline_info *ccp));
+static void	restore_cmdline __ARGS((struct cmdline_info *ccp));
 static int	cmdline_paste __ARGS((int regname, int literally));
 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
 static void	redrawcmd_preedit __ARGS((void));
 #endif
 #ifdef FEAT_WILDMENU
 		c = Ctrl_BSL;
 	    }
 #ifdef FEAT_EVAL
 	    else if (c == 'e')
 	    {
-		struct cmdline_info	    save_ccline;
+		struct cmdline_info save_ccline;
-		char_u		    *p;
+		char_u		    *p = NULL;
 		/*
 		 * Replace the command line with the result of an expression.
 		 * Need to save the current command line, to be able to enter
 		 * a new one...
 		 */
 		if (ccline.cmdpos == ccline.cmdlen)
 		    new_cmdpos = 99999;	/* keep it at the end */
 		else
 		    new_cmdpos = ccline.cmdpos;
-		save_ccline = ccline;
-		ccline.cmdbuff = NULL;
+		save_cmdline(&save_ccline);
-		ccline.cmdprompt = NULL;
 		c = get_expr_register();
-		ccline = save_ccline;
+		restore_cmdline(&save_ccline);
 		if (c == '=')
 		{
+		    save_cmdline(&save_ccline);
 		    p = get_expr_line();
-		    if (p != NULL
+		    restore_cmdline(&save_ccline);
-			     && realloc_cmdbuff((int)STRLEN(p) + 1) == OK)
+		    if (p != NULL && realloc_cmdbuff((int)STRLEN(p) + 1) == OK)
 		    {
 			ccline.cmdlen = STRLEN(p);
 			STRCPY(ccline.cmdbuff, p);
 			vim_free(p);
 			beep_flush();
 			c = ESC;
 		    }
 		    else
 		    {
-			save_ccline = ccline;
+			save_cmdline(&save_ccline);
-			ccline.cmdbuff = NULL;
-			ccline.cmdprompt = NULL;
 			c = get_expr_register();
-			ccline = save_ccline;
+			restore_cmdline(&save_ccline);
 		    }
 		}
 #endif
 		if (c != ESC)	    /* use ESC to cancel inserting register */
 		{
 #endif
 #ifdef CURSOR_SHAPE
 ui_cursor_shape();		/* may show different cursor shape */
 #endif
-return ccline.cmdbuff;
+{
+	char_u *p = ccline.cmdbuff;
+	/* Make ccline empty, getcmdline() may try to use it. */
+	ccline.cmdbuff = NULL;
+	return p;
+}
 }
 #if (defined(FEAT_CRYPT) || defined(FEAT_EVAL)) || defined(PROTO)
 /*
 * Get a command line with a prompt.
 {
 char_u		*s;
 struct cmdline_info	save_ccline;
 int			msg_col_save = msg_col;
-save_ccline = ccline;
+save_cmdline(&save_ccline);
-ccline.cmdbuff = NULL;
 ccline.cmdprompt = prompt;
 ccline.cmdattr = attr;
 s = getcmdline(firstc, 1L, 0);
-ccline = save_ccline;
+restore_cmdline(&save_ccline);
 /* Restore msg_col, the prompt from input() may have changed it. */
 msg_col = msg_col_save;
 return s;
 }
 if (redraw)
 	msg_check();
 return retval;
 }
+static struct cmdline_info  prev_ccline;
+static int		    prev_ccline_used = FALSE;
+/*
+* Save ccline, because obtaining the "=" register may execute "normal :cmd"
+* and overwrite it.  But get_cmdline_str() may need it, thus make it
+* available globally in prev_ccline.
+*/
+static void
+save_cmdline(ccp)
+struct cmdline_info *ccp;
+{
+if (!prev_ccline_used)
+{
+	vim_memset(&prev_ccline, 0, sizeof(struct cmdline_info));
+	prev_ccline_used = TRUE;
+}
+*ccp = prev_ccline;
+prev_ccline = ccline;
+ccline.cmdbuff = NULL;
+ccline.cmdprompt = NULL;
+}
+/*
+* Resture ccline after it has been saved with save_cmdline().
+*/
+static void
+restore_cmdline(ccp)
+struct cmdline_info *ccp;
+{
+ccline = prev_ccline;
+prev_ccline = *ccp;
+}
 /*
 * paste a yank register into the command line.
 * used by CTRL-R command in command-line mode
 * insert_reg() can't be used here, because special characters from the
 * register contents will be interpreted as commands.
 #ifdef FEAT_CLIPBOARD
 regname = may_get_selection(regname);
 #endif
-/* Need to save and restore ccline, because obtaining the "=" register may
+/* Need to save and restore ccline. */
-* execute "normal :cmd" and overwrite it. */
+save_cmdline(&save_ccline);
-save_ccline = ccline;
-ccline.cmdbuff = NULL;
-ccline.cmdprompt = NULL;
 i = get_spec_reg(regname, &arg, &allocated, TRUE);
-ccline = save_ccline;
+restore_cmdline(&save_ccline);
 if (i)
 {
 	/* Got the value of a special register in "arg". */
 	if (arg == NULL)
 	return -1;
 return history[histype][hisidx[histype]].hisnum;
 }
+static struct cmdline_info *get_ccline_ptr __ARGS((void));
+/*
+* Get pointer to the command line info to use. cmdline_paste() may clear
+* ccline and put the previous value in prev_ccline.
+*/
+static struct cmdline_info *
+get_ccline_ptr()
+{
+if ((State & CMDLINE) == 0)
+	return NULL;
+if (ccline.cmdbuff != NULL)
+	return &ccline;
+if (prev_ccline_used && prev_ccline.cmdbuff != NULL)
+	return &prev_ccline;
+return NULL;
+}
 /*
 * Get the current command line in allocated memory.
 * Only works when the command line is being edited.
 * Returns NULL when something is wrong.
 */
 char_u *
 get_cmdline_str()
 {
-if (ccline.cmdbuff == NULL || (State & CMDLINE) == 0)
+struct cmdline_info *p = get_ccline_ptr();
+if (p == NULL)
 	return NULL;
-return vim_strnsave(ccline.cmdbuff, ccline.cmdlen);
+return vim_strnsave(p->cmdbuff, p->cmdlen);
 }
 /*
 * Get the current command line position, counted in bytes.
 * Zero is the first position.
 * Returns -1 when something is wrong.
 */
 int
 get_cmdline_pos()
 {
-if (ccline.cmdbuff == NULL || (State & CMDLINE) == 0)
+struct cmdline_info *p = get_ccline_ptr();
+if (p == NULL)
 	return -1;
-return ccline.cmdpos;
+return p->cmdpos;
 }
 /*
 * Set the command line byte position to "pos".  Zero is the first position.
 * Only works when the command line is being edited.
 */
 int
 set_cmdline_pos(pos)
 int		pos;
 {
-if (ccline.cmdbuff == NULL || (State & CMDLINE) == 0)
+struct cmdline_info *p = get_ccline_ptr();
+if (p == NULL)
 	return 1;
 /* The position is not set directly but after CTRL-\ e or CTRL-R = has
 * changed the command line. */
 if (pos < 0)

Mercurial > vim

comparison src/ex_getln.c @ 95:a2081e6febb8