aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.0-038

Browse Source
This commit is contained in:
Bram Moolenaar 2006-07-12 19:49:41 +00:00
parent a3f2ecdecb
commit ce6ef25cef
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/eval.c
View File

@ -8252,6 +8252,12 @@ f_complete(argvars, rettv)
EMSG(_("E785: complete() can only be used in Insert mode")); EMSG(_("E785: complete() can only be used in Insert mode"));
return; 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) if (argvars[1].v_type != VAR_LIST || argvars[1].vval.v_list == NULL)
{ {
EMSG(_(e_invarg)); EMSG(_(e_invarg));

1
src/proto/undo.pro
View File

@ -4,6 +4,7 @@ extern int u_save __ARGS((linenr_T top, linenr_T bot));
extern int u_savesub __ARGS((linenr_T lnum)); extern int u_savesub __ARGS((linenr_T lnum));
extern int u_inssub __ARGS((linenr_T lnum)); extern int u_inssub __ARGS((linenr_T lnum));
extern int u_savedel __ARGS((linenr_T lnum, long nlines)); 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_undo __ARGS((int count));
extern void u_redo __ARGS((int count)); extern void u_redo __ARGS((int count));
extern void undo_time __ARGS((long step, int sec, int absolute)); extern void undo_time __ARGS((long step, int sec, int absolute));

3
src/undo.c
View File

@ -84,7 +84,6 @@
static void u_unch_branch __ARGS((u_header_T *uhp)); static void u_unch_branch __ARGS((u_header_T *uhp));
static u_entry_T *u_get_headentry __ARGS((void)); static u_entry_T *u_get_headentry __ARGS((void));
static void u_getbot __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 int u_savecommon __ARGS((linenr_T, linenr_T, linenr_T));
static void u_doit __ARGS((int count)); static void u_doit __ARGS((int count));
static void u_undoredo __ARGS((int undo)); 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 TRUE when undo is allowed. Otherwise give an error message and
* return FALSE. * return FALSE.
*/ */
static int int
undo_allowed() undo_allowed()
{ {
/* Don't allow changes when 'modifiable' is off. */ /* Don't allow changes when 'modifiable' is off. */

2
src/version.c
View File

@ -666,6 +666,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
38,
/**/ /**/
37, 37,
/**/ /**/