# HG changeset patch # User Bram Moolenaar # Date 1430729163 -7200 # Node ID 874c953aca495c7b087a0d345cad1fb9d92a9539 # Parent 6ea30831ef7498aa567430fb45c608c5f3e4d659 patch 7.4.716 Problem: When using the 'c' flag of ":substitute" and selecting "a" or "l" at the prompt the flags are not remembered for ":&&". (Ingo Karkat) Solution: Save the flag values and restore them. (Hirohito Higashi) diff --git a/src/ex_cmds.c b/src/ex_cmds.c --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -4279,6 +4279,8 @@ do_sub(eap) static int do_list = FALSE; /* list last line with subs. */ static int do_number = FALSE; /* list last line with line nr*/ static int do_ic = 0; /* ignore case flag */ + int save_do_all; /* remember user specified 'g' flag */ + int save_do_ask; /* remember user specified 'c' flag */ char_u *pat = NULL, *sub = NULL; /* init for GCC */ int delimiter; int sublen; @@ -4514,6 +4516,9 @@ do_sub(eap) if (do_count) do_ask = FALSE; + save_do_all = do_all; + save_do_ask = do_ask; + /* * check for a trailing count */ @@ -5327,6 +5332,10 @@ outofmem: #endif vim_regfree(regmatch.regprog); + + /* Restore the flag values, they can be used for ":&&". */ + do_all = save_do_all; + do_ask = save_do_ask; } /* diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 716, +/**/ 715, /**/ 714,