vim: src/edit.c comparison

comparison src/edit.c @ 7074:c8efa41dd451 v7.4.849

commit https://github.com/vim/vim/commit/8b5f65a527c353b9942e362e719687c3a7592309 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Sep 1 19:26:12 2015 +0200 patch 7.4.849 Problem: Moving the cursor in Insert mode starts new undo sequence. Solution: Add CTRL-G U to keep the undo sequence for the following cursor movement command. (Christian Brabandt)

author	Christian Brabandt <cb@256bit.org>
date	Tue, 01 Sep 2015 19:30:04 +0200
parents	e859731ea1cd
children	4e8f07fc7ca3

comparison

equal deleted inserted replaced

-:1b4f682069c9
+:c8efa41dd451
 static void insert_special __ARGS((int, int, int));
 static void internal_format __ARGS((int textwidth, int second_indent, int flags, int format_only, int c));
 static void check_auto_format __ARGS((int));
 static void redo_literal __ARGS((int c));
 static void start_arrow __ARGS((pos_T *end_insert_pos));
+static void start_arrow_with_change __ARGS((pos_T *end_insert_pos, int change));
+static void start_arrow_common __ARGS((pos_T *end_insert_pos, int change));
 #ifdef FEAT_SPELL
 static void check_spell_redraw __ARGS((void));
 static void spell_back_to_badword __ARGS((void));
 static int  spell_bad_len = 0;	/* length of located bad word */
 #endif
 static void ins_mousescroll __ARGS((int dir));
 #endif
 #if defined(FEAT_GUI_TABLINE) || defined(PROTO)
 static void ins_tabline __ARGS((int c));
 #endif
-static void ins_left __ARGS((void));
+static void ins_left __ARGS((int end_change));
 static void ins_home __ARGS((int c));
 static void ins_end __ARGS((int c));
 static void ins_s_left __ARGS((void));
-static void ins_right __ARGS((void));
+static void ins_right __ARGS((int end_change));
 static void ins_s_right __ARGS((void));
 static void ins_up __ARGS((int startcol));
 static void ins_pageup __ARGS((void));
 static void ins_down __ARGS((int startcol));
 static void ins_pagedown __ARGS((void));
 					   char.  Set when edit() is called.
 					   after that arrow_used is used. */
 static int	did_add_space = FALSE;	/* auto_format() added an extra space
 					   under the cursor */
+static int	dont_sync_undo = FALSE;	/* CTRL-G U prevents syncing undo for
+					   the next left/right cursor */
 /*
 * edit(): Start inserting text.
 *
 * "cmdchar" can be:
 	/*
 	 * Get a character for Insert mode.  Ignore K_IGNORE.
 	 */
 	if (c != K_CURSORHOLD)
 	    lastc = c;		/* remember the previous char for CTRL-D */
+	/* After using CTRL-G U the next cursor key will not break undo. */
+	if (dont_sync_undo == MAYBE)
+	    dont_sync_undo = TRUE;
+	else
+	    dont_sync_undo = FALSE;
 	do
 	{
 	    c = safe_vgetc();
 	} while (c == K_IGNORE);
 	case K_LEFT:	/* <Left> */
 	    if (mod_mask & (MOD_MASK_SHIFT|MOD_MASK_CTRL))
 		ins_s_left();
 	    else
-		ins_left();
+		ins_left(dont_sync_undo == FALSE);
 	    break;
 	case K_S_LEFT:	/* <S-Left> */
 	case K_C_LEFT:
 	    ins_s_left();
 	case K_RIGHT:	/* <Right> */
 	    if (mod_mask & (MOD_MASK_SHIFT|MOD_MASK_CTRL))
 		ins_s_right();
 	    else
-		ins_right();
+		ins_right(dont_sync_undo == FALSE);
 	    break;
 	case K_S_RIGHT:	/* <S-Right> */
 	case K_C_RIGHT:
 	    ins_s_right();
 * 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;	    /* can be NULL */
+pos_T    *end_insert_pos;		/* can be NULL */
 {
-if (!arrow_used)	    /* something has been inserted */
+start_arrow_common(end_insert_pos, TRUE);
+}
+/*
+* Like start_arrow() but with end_change argument.
+* Will prepare for redo of CTRL-G U if "end_change" is FALSE.
+*/
+static void
+start_arrow_with_change(end_insert_pos, end_change)
+pos_T    *end_insert_pos;		/* can be NULL */
+int	      end_change;		/* end undoable change */
+{
+start_arrow_common(end_insert_pos, end_change);
+if (!end_change)
+{
+	AppendCharToRedobuff(Ctrl_G);
+	AppendCharToRedobuff('U');
+}
+}
+static void
+start_arrow_common(end_insert_pos, end_change)
+pos_T    *end_insert_pos;		/* can be NULL */
+int	      end_change;		/* end undoable change */
+{
+if (!arrow_used && end_change)	/* something has been inserted */
 {
 	AppendToRedobuff(ESC_STR);
 	stop_insert(end_insert_pos, FALSE, FALSE);
 	arrow_used = TRUE;	/* this means we stopped the current insert */
 }
 		   * a line to the previous one must save for undo. */
 		  update_Insstart_orig = FALSE;
 		  Insstart = curwin->w_cursor;
 		  break;
+	/* CTRL-G U: do not break undo with the next char */
+	case 'U':
+		  /* Allow one left/right cursor movement with the next char,
+		   * without breaking undo. */
+		  dont_sync_undo = MAYBE;
+		  break;
 	/* Unknown CTRL-G command, reserved for future expansion. */
 	default:  vim_beep(BO_CTRLG);
 }
 }
 }
 }
 #endif
 static void
-ins_left()
+ins_left(end_change)
+int	    end_change; /* end undoable change */
 {
 pos_T	tpos;
 #ifdef FEAT_FOLDING
 if ((fdo_flags & FDO_HOR) && KeyTyped)
 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
 	/* Only call start_arrow() when not busy with preediting, it will
 	 * break undo.  K_LEFT is inserted in im_correct_cursor(). */
 	if (!im_is_preediting())
 #endif
-	    start_arrow(&tpos);
+	{
+	    start_arrow_with_change(&tpos, end_change);
+	    if (!end_change)
+		AppendCharToRedobuff(K_LEFT);
+	}
 #ifdef FEAT_RIGHTLEFT
 	/* If exit reversed string, position is fixed */
 	if (revins_scol != -1 && (int)curwin->w_cursor.col >= revins_scol)
 	    revins_legal++;
 	revins_chars++;
 * if 'whichwrap' set for cursor in insert mode may go to
 * previous line
 */
 else if (vim_strchr(p_ww, '[') != NULL && curwin->w_cursor.lnum > 1)
 {
+	/* always break undo when moving upwards/downwards, else undo may break */
 	start_arrow(&tpos);
 	--(curwin->w_cursor.lnum);
 	coladvance((colnr_T)MAXCOL);
 	curwin->w_set_curswant = TRUE;	/* so we stay at the end */
 }
 else
 	vim_beep(BO_CRSR);
+dont_sync_undo = FALSE;
 }
 static void
 ins_home(c)
 int		c;
 else
 	vim_beep(BO_CRSR);
 }
 static void
-ins_right()
+ins_right(end_change)
+int	    end_change; /* end undoable change */
 {
 #ifdef FEAT_FOLDING
 if ((fdo_flags & FDO_HOR) && KeyTyped)
 	foldOpenCursor();
 #endif
 #ifdef FEAT_VIRTUALEDIT
 	    || virtual_active()
 #endif
 	    )
 {
-	start_arrow(&curwin->w_cursor);
+	start_arrow_with_change(&curwin->w_cursor, end_change);
+	if (!end_change)
+	    AppendCharToRedobuff(K_RIGHT);
 	curwin->w_set_curswant = TRUE;
 #ifdef FEAT_VIRTUALEDIT
 	if (virtual_active())
 	    oneright();
 	else
 	++curwin->w_cursor.lnum;
 	curwin->w_cursor.col = 0;
 }
 else
 	vim_beep(BO_CRSR);
+dont_sync_undo = FALSE;
 }
 static void
 ins_s_right()
 {

Mercurial > vim

comparison src/edit.c @ 7074:c8efa41dd451 v7.4.849