vim: src/edit.c comparison

comparison src/edit.c @ 840:2c885fab04e3 v7.0e06

updated for version 7.0e06

author	vimboss
date	Sat, 22 Apr 2006 22:33:57 +0000
parents	5a7843c57316
children	c2cae213194d

comparison

equal deleted inserted replaced

-:1f3b1021f002
+:2c885fab04e3
 static void spell_back_to_badword __ARGS((void));
 static int  spell_bad_len = 0;	/* length of located bad word */
 #endif
 static void stop_insert __ARGS((pos_T *end_insert_pos, int esc));
 static int  echeck_abbr __ARGS((int));
+#if 0
 static void replace_push_off __ARGS((int c));
+#endif
 static int  replace_pop __ARGS((void));
 static void replace_join __ARGS((int off));
 static void replace_pop_ins __ARGS((void));
 #ifdef FEAT_MBYTE
 static void mb_replace_pop_ins __ARGS((int cc));
 * start_arrow() is called when an arrow key is used in insert mode.
 * For undo/redo it resembles hitting the <ESC> key.
 */
 static void
 start_arrow(end_insert_pos)
-pos_T    *end_insert_pos;
+pos_T    *end_insert_pos;	    /* can be NULL */
 {
 if (!arrow_used)	    /* something has been inserted */
 {
 	AppendToRedobuff(ESC_STR);
 	stop_insert(end_insert_pos, FALSE);
 return (arrow_used || ins_need_undo ? FAIL : OK);
 }
 /*
-* do a few things to stop inserting
+* Do a few things to stop inserting.
+* "end_insert_pos" is where insert ended.  It is NULL when we already jumped
+* to another window/buffer.
 */
 static void
 stop_insert(end_insert_pos, esc)
-pos_T	*end_insert_pos;	/* where insert ended */
+pos_T	*end_insert_pos;
 int		esc;			/* called by ins_esc() */
 {
 int		cc;
 char_u	*ptr;
 	last_insert_skip = new_insert_skip;
 }
 else
 	vim_free(ptr);
-if (!arrow_used)
+if (!arrow_used && end_insert_pos != NULL)
 {
 	/* Auto-format now.  It may seem strange to do this when stopping an
 	 * insertion (or moving the cursor), but it's required when appending
 	 * a line and having it end in a space.  But only do it when something
 	 * was actually inserted, otherwise undo won't work. */
 	/* If we just did an auto-indent, remove the white space from the end
 	 * of the line, and put the cursor back.
 	 * Do this when ESC was used or moving the cursor up/down. */
 	if (did_ai && (esc || (vim_strchr(p_cpo, CPO_INDENT) == NULL
-			   && curwin->w_cursor.lnum != end_insert_pos->lnum)))
+			&& curwin->w_cursor.lnum != end_insert_pos->lnum)))
 	{
 	    pos_T	tpos = curwin->w_cursor;
 	    curwin->w_cursor = *end_insert_pos;
 	    for (;;)
 did_si = FALSE;
 can_si = FALSE;
 can_si_back = FALSE;
 #endif
-/* set '[ and '] to the inserted text */
+/* Set '[ and '] to the inserted text.  When end_insert_pos is NULL we are
-curbuf->b_op_start = Insstart;
+* now in a different buffer. */
-curbuf->b_op_end = *end_insert_pos;
+if (end_insert_pos != NULL)
+{
+	curbuf->b_op_start = Insstart;
+	curbuf->b_op_end = *end_insert_pos;
+}
 }
 /*
 * Set the last inserted text to a single character.
 * Used for the replace command.
 	mch_memmove(p + 1, p, (size_t)(replace_offset * sizeof(char_u)));
 *p = c;
 ++replace_stack_nr;
 }
+#if 0
 /*
 * call replace_push(c) with replace_offset set to the first NUL.
 */
 static void
 replace_push_off(c)
 	if (*--p == NUL)
 	    break;
 replace_push(c);
 replace_offset = 0;
 }
+#endif
 /*
 * Pop one item from the replace stack.
 * return -1 if stack empty
 * return replaced character or NUL otherwise
 				    || arrow_used))))))
 	{
 	    int		ts;
 	    colnr_T	vcol;
 	    colnr_T	want_vcol;
+#if 0
 	    int		extra = 0;
+#endif
 	    *inserted_space_p = FALSE;
 	    if (p_sta && in_indent)
 		ts = curbuf->b_p_sw;
 	    else
 		    ins_char(' ');
 		else
 #endif
 		{
 		    ins_str((char_u *)" ");
-		    if ((State & REPLACE_FLAG) && extra <= 1)
+		    if ((State & REPLACE_FLAG) /* && extra <= 1 */)
 		    {
+#if 0
 			if (extra)
 			    replace_push_off(NUL);
 			else
+#endif
 			    replace_push(NUL);
 		    }
+#if 0
 		    if (extra == 2)
 			extra = 1;
+#endif
 		}
 		getvcol(curwin, &curwin->w_cursor, &vcol, NULL, NULL);
 	    }
 	}
 static void
 ins_mouse(c)
 int	    c;
 {
 pos_T	tpos;
+win_T	*old_curwin = curwin;
 # ifdef FEAT_GUI
 /* When GUI is active, also move/paste when 'mouse' is empty */
 if (!gui.in_use)
 # endif
 undisplay_dollar();
 tpos = curwin->w_cursor;
 if (do_mouse(NULL, c, BACKWARD, 1L, 0))
 {
-	start_arrow(&tpos);
+#ifdef FEAT_WINDOWS
+	win_T	*new_curwin = curwin;
+	if (curwin != old_curwin && win_valid(old_curwin))
+	{
+	    /* Mouse took us to another window.  We need to go back to the
+	     * previous one to stop insert there properly. */
+	    curwin = old_curwin;
+	    curbuf = curwin->w_buffer;
+	}
+#endif
+	start_arrow(curwin == old_curwin ? &tpos : NULL);
+#ifdef FEAT_WINDOWS
+	if (curwin != new_curwin && win_valid(new_curwin))
+	{
+	    curwin = new_curwin;
+	    curbuf = curwin->w_buffer;
+	}
+#endif
 # ifdef FEAT_CINDENT
 	can_cindent = TRUE;
 # endif
 }

Mercurial > vim

comparison src/edit.c @ 840:2c885fab04e3 v7.0e06