Hi Ben! On Fr, 16 Jan 2015, Ben Fritz wrote:
> On Friday, January 16, 2015 at 4:55:44 PM UTC-6, Christian Brabandt wrote: > > Hi Bram! > > > > On Fr, 16 Jan 2015, Bram Moolenaar wrote: > > > > > > > > Christian Brabandt wrote: > > > > Hm, we already have special cases <C-[Left|Right]> and <S-[Left|Right]> > > > > to move by word|WORD. So how about making <M-Left> and <M-Right> move > > > > without breaking undo? > > > > https://github.com/chrisbra/vim-mq-patches/blob/master/move_cursor_without_breaking_undo > > > > > > It's very likely there will be a request for other movements, e.g. a > > > word back. > > > How about a prefix for movement commands? Something > > > starting with CTRL-G. It's several keys to type, but I assume this will > > > mostly be used in mappings. > > > > I thought about that. But my fear is, that this will allow to jump > > anywhere in insert mode and I think this would probably break undo (a > > problem we have just fixed with <c-r>= in insert mode before 7.4). > > So I did intentionally just allow <M-Left> and <M-Right> in the hope, > > that this will still allow proper undo and will cover most of the snip > > plugin use-cases. > > > > I'm definitely going to try the patch, but I think I'd prefer a different > prefix also. If it works this is exactly what is needed for auto-close, > without all the fuss of a big plugin (unless you want that...) > > The meta-keys have traditionally been "safe" for mapping in Vim without > stepping on existing features, I think keeping it that way is a good idea. > > And I agree these will mostly be used in mappings. > > CTRL-G_u breaks undo sequence. What about CTRL-G_U keeping undo sequence > unbroken? > > It's ok for the short term if just CTRL-G_U_<Left> and CTRL-G_U_<Right> are > supported to start with...with potential for more if there is a need for them. > > I'd probably restrict to movement within a single line, though. Okay, above URL contains an updated version, that won't break undo for a single <left>/<break> movement after <Ctrl-G>U have been pressed (but only, if the cursor stays in the same line). Best, Christian -- Wußten Sie schon... ... daß sich die alten Rittersleut' ihre Morgensterne auch am Abend auf die Schädel droschen? -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
# HG changeset patch # Parent 691a69ae71349cc2f6bd796055c0c9a759228f81 Make <M-Left> and <M-Right> move the cursor in insert mode without breaking undo From https://groups.google.com/d/msg/vim_use/klj6nlDOriI/aeNjtWp_U80J This will allow to use <C-G>U<Left> and <C-G>U<Right> to move the cursor without breaking the undo sequence. However, a new undo changae will be created if left/right move across lines, so that undo is still workable. This should fix the problem to undo/redo delimate like plugins (hopefully). diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt --- a/runtime/doc/insert.txt +++ b/runtime/doc/insert.txt @@ -375,6 +375,9 @@ CTRL-O execute one command, return to I CTRL-\ CTRL-O like CTRL-O but don't move the cursor *i_CTRL-\_CTRL-O* CTRL-L when 'insertmode' is set: go to Normal mode *i_CTRL-L* CTRL-G u break undo sequence, start new change *i_CTRL-G_u* +CTRL-G U don't break undo with next left/right cursor *i_CTRL-G_U* + (but only, if the cursor stays within same + the line) ----------------------------------------------------------------------- Note: If the cursor keys take you out of Insert mode, check the 'noesckeys' diff --git a/src/edit.c b/src/edit.c --- a/src/edit.c +++ b/src/edit.c @@ -193,7 +193,7 @@ static void insert_special __ARGS((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 __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)); @@ -233,11 +233,11 @@ static void ins_mousescroll __ARGS((int #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 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 change)); static void ins_s_right __ARGS((void)); static void ins_up __ARGS((int startcol)); static void ins_pageup __ARGS((void)); @@ -289,6 +289,8 @@ static int ins_need_undo; /* call u_sav static int did_add_space = FALSE; /* auto_format() added an extra space under the cursor */ +static int stop_sync_undo = FALSE; /* CTRL-G U prevents syncing undo for + the next left/right cursor */ /* * edit(): Start inserting text. @@ -758,6 +760,11 @@ edit(cmdchar, startln, count) * Get a character for Insert mode. Ignore K_IGNORE. */ lastc = c; /* remember previous char for CTRL-D */ + + if (stop_sync_undo == MAYBE) /* cursor might come next */ + stop_sync_undo = TRUE; + else + stop_sync_undo = FALSE; /* sync undo with next char, if needed */ do { c = safe_vgetc(); @@ -1228,7 +1235,7 @@ doESCkey: if (mod_mask & (MOD_MASK_SHIFT|MOD_MASK_CTRL)) ins_s_left(); else - ins_left(); + ins_left(stop_sync_undo == FALSE); break; case K_S_LEFT: /* <S-Left> */ @@ -1240,7 +1247,7 @@ doESCkey: if (mod_mask & (MOD_MASK_SHIFT|MOD_MASK_CTRL)) ins_s_right(); else - ins_right(); + ins_right(stop_sync_undo == FALSE); break; case K_S_RIGHT: /* <S-Right> */ @@ -6721,10 +6728,11 @@ redo_literal(c) * For undo/redo it resembles hitting the <ESC> key. */ static void -start_arrow(end_insert_pos) +start_arrow(end_insert_pos, change) pos_T *end_insert_pos; /* can be NULL */ -{ - if (!arrow_used) /* something has been inserted */ + int change; /* if true, start a new change */ +{ + if (!arrow_used && change) /* something has been inserted */ { AppendToRedobuff(ESC_STR); stop_insert(end_insert_pos, FALSE, FALSE); @@ -6763,7 +6771,7 @@ spell_back_to_badword() spell_bad_len = spell_move_to(curwin, BACKWARD, TRUE, TRUE, NULL); if (curwin->w_cursor.col != tpos.col) - start_arrow(&tpos); + start_arrow(&tpos, TRUE); } #endif @@ -8289,6 +8297,12 @@ ins_ctrl_g() 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 */ + stop_sync_undo = MAYBE; + break; + /* Unknown CTRL-G command, reserved for future expansion. */ default: vim_beep(); } @@ -9176,7 +9190,7 @@ ins_mouse(c) curbuf = curwin->w_buffer; } #endif - start_arrow(curwin == old_curwin ? &tpos : NULL); + start_arrow(curwin == old_curwin ? &tpos : NULL, TRUE); #ifdef FEAT_WINDOWS if (curwin != new_curwin && win_valid(new_curwin)) { @@ -9280,7 +9294,7 @@ ins_mousescroll(dir) if (!equalpos(curwin->w_cursor, tpos)) { - start_arrow(&tpos); + start_arrow(&tpos, TRUE); # ifdef FEAT_CINDENT can_cindent = TRUE; # endif @@ -9298,7 +9312,7 @@ ins_tabline(c) || (current_tab != 0 && current_tab != tabpage_index(curtab))) { undisplay_dollar(); - start_arrow(&curwin->w_cursor); + start_arrow(&curwin->w_cursor, TRUE); # ifdef FEAT_CINDENT can_cindent = TRUE; # endif @@ -9324,7 +9338,7 @@ ins_scroll() tpos = curwin->w_cursor; if (gui_do_scroll()) { - start_arrow(&tpos); + start_arrow(&tpos, TRUE); # ifdef FEAT_CINDENT can_cindent = TRUE; # endif @@ -9340,7 +9354,7 @@ ins_horscroll() tpos = curwin->w_cursor; if (gui_do_horiz_scroll(scrollbar_value, FALSE)) { - start_arrow(&tpos); + start_arrow(&tpos, TRUE); # ifdef FEAT_CINDENT can_cindent = TRUE; # endif @@ -9349,7 +9363,8 @@ ins_horscroll() #endif static void -ins_left() +ins_left(change) + int change; /* start a new change */ { pos_T tpos; @@ -9366,7 +9381,15 @@ ins_left() * break undo. K_LEFT is inserted in im_correct_cursor(). */ if (!im_is_preediting()) #endif - start_arrow(&tpos); + { + start_arrow(&tpos, change); + if (!change) + { + AppendCharToRedobuff(Ctrl_G); + AppendCharToRedobuff('U'); + AppendCharToRedobuff(K_LEFT); + } + } #ifdef FEAT_RIGHTLEFT /* If exit reversed string, position is fixed */ if (revins_scol != -1 && (int)curwin->w_cursor.col >= revins_scol) @@ -9381,13 +9404,15 @@ ins_left() */ else if (vim_strchr(p_ww, '[') != NULL && curwin->w_cursor.lnum > 1) { - start_arrow(&tpos); + /* always break undo when moving upwards/downwards, else undo may break */ + start_arrow(&tpos, TRUE); --(curwin->w_cursor.lnum); coladvance((colnr_T)MAXCOL); curwin->w_set_curswant = TRUE; /* so we stay at the end */ } else vim_beep(); + stop_sync_undo = FALSE; } static void @@ -9409,7 +9434,7 @@ ins_home(c) curwin->w_cursor.coladd = 0; #endif curwin->w_curswant = 0; - start_arrow(&tpos); + start_arrow(&tpos, TRUE); } static void @@ -9429,7 +9454,7 @@ ins_end(c) coladvance((colnr_T)MAXCOL); curwin->w_curswant = MAXCOL; - start_arrow(&tpos); + start_arrow(&tpos, TRUE); } static void @@ -9442,7 +9467,7 @@ ins_s_left() undisplay_dollar(); if (curwin->w_cursor.lnum > 1 || curwin->w_cursor.col > 0) { - start_arrow(&curwin->w_cursor); + start_arrow(&curwin->w_cursor, TRUE); (void)bck_word(1L, FALSE, FALSE); curwin->w_set_curswant = TRUE; } @@ -9451,7 +9476,8 @@ ins_s_left() } static void -ins_right() +ins_right(change) + int change; /* start a new change */ { #ifdef FEAT_FOLDING if ((fdo_flags & FDO_HOR) && KeyTyped) @@ -9464,7 +9490,13 @@ ins_right() #endif ) { - start_arrow(&curwin->w_cursor); + start_arrow(&curwin->w_cursor, change); + if (!change) + { + AppendCharToRedobuff(Ctrl_G); + AppendCharToRedobuff('U'); + AppendCharToRedobuff(K_RIGHT); + } curwin->w_set_curswant = TRUE; #ifdef FEAT_VIRTUALEDIT if (virtual_active()) @@ -9491,13 +9523,14 @@ ins_right() else if (vim_strchr(p_ww, ']') != NULL && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) { - start_arrow(&curwin->w_cursor); + start_arrow(&curwin->w_cursor, TRUE); curwin->w_set_curswant = TRUE; ++curwin->w_cursor.lnum; curwin->w_cursor.col = 0; } else vim_beep(); + stop_sync_undo = FALSE; } static void @@ -9511,7 +9544,7 @@ ins_s_right() if (curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count || gchar_cursor() != NUL) { - start_arrow(&curwin->w_cursor); + start_arrow(&curwin->w_cursor, TRUE); (void)fwd_word(1L, FALSE, 0); curwin->w_set_curswant = TRUE; } @@ -9541,7 +9574,7 @@ ins_up(startcol) #endif ) redraw_later(VALID); - start_arrow(&tpos); + start_arrow(&tpos, TRUE); #ifdef FEAT_CINDENT can_cindent = TRUE; #endif @@ -9563,7 +9596,7 @@ ins_pageup() /* <C-PageUp>: tab page back */ if (first_tabpage->tp_next != NULL) { - start_arrow(&curwin->w_cursor); + start_arrow(&curwin->w_cursor, TRUE); goto_tabpage(-1); } return; @@ -9573,7 +9606,7 @@ ins_pageup() tpos = curwin->w_cursor; if (onepage(BACKWARD, 1L) == OK) { - start_arrow(&tpos); + start_arrow(&tpos, TRUE); #ifdef FEAT_CINDENT can_cindent = TRUE; #endif @@ -9604,7 +9637,7 @@ ins_down(startcol) #endif ) redraw_later(VALID); - start_arrow(&tpos); + start_arrow(&tpos, TRUE); #ifdef FEAT_CINDENT can_cindent = TRUE; #endif @@ -9626,7 +9659,7 @@ ins_pagedown() /* <C-PageDown>: tab page forward */ if (first_tabpage->tp_next != NULL) { - start_arrow(&curwin->w_cursor); + start_arrow(&curwin->w_cursor, TRUE); goto_tabpage(0); } return; @@ -9636,7 +9669,7 @@ ins_pagedown() tpos = curwin->w_cursor; if (onepage(FORWARD, 1L) == OK) { - start_arrow(&tpos); + start_arrow(&tpos, TRUE); #ifdef FEAT_CINDENT can_cindent = TRUE; #endif
