Mercurial > vim
changeset 912:adf6a9dcaded v7.0.038
updated for version 7.0-038
| author | vimboss |
|---|---|
| date | Wed, 12 Jul 2006 19:49:41 +0000 |
| parents | 697dec8ec5e7 |
| children | 1aba098d6abc |
| files | src/eval.c src/proto/undo.pro src/undo.c src/version.c |
| diffstat | 4 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/eval.c +++ b/src/eval.c @@ -8252,6 +8252,12 @@ f_complete(argvars, rettv) EMSG(_("E785: complete() can only be used in Insert mode")); return; } + + /* Check for undo allowed here, because if something was already inserted + * the line was already saved for undo and this check isn't done. */ + if (!undo_allowed()) + return; + if (argvars[1].v_type != VAR_LIST || argvars[1].vval.v_list == NULL) { EMSG(_(e_invarg));
--- a/src/proto/undo.pro +++ b/src/proto/undo.pro @@ -4,6 +4,7 @@ extern int u_save __ARGS((linenr_T top, extern int u_savesub __ARGS((linenr_T lnum)); extern int u_inssub __ARGS((linenr_T lnum)); extern int u_savedel __ARGS((linenr_T lnum, long nlines)); +extern int undo_allowed __ARGS((void)); extern void u_undo __ARGS((int count)); extern void u_redo __ARGS((int count)); extern void undo_time __ARGS((long step, int sec, int absolute));
--- a/src/undo.c +++ b/src/undo.c @@ -84,7 +84,6 @@ static void u_unch_branch __ARGS((u_header_T *uhp)); static u_entry_T *u_get_headentry __ARGS((void)); static void u_getbot __ARGS((void)); -static int undo_allowed __ARGS((void)); static int u_savecommon __ARGS((linenr_T, linenr_T, linenr_T)); static void u_doit __ARGS((int count)); static void u_undoredo __ARGS((int undo)); @@ -196,7 +195,7 @@ u_savedel(lnum, nlines) * Return TRUE when undo is allowed. Otherwise give an error message and * return FALSE. */ - static int + int undo_allowed() { /* Don't allow changes when 'modifiable' is off. */