Mercurial > vim
diff src/undo.c @ 839:1f3b1021f002 v7.0e05
updated for version 7.0e05
author | vimboss |
---|---|
date | Fri, 21 Apr 2006 22:12:41 +0000 |
parents | 8bebcabccc2c |
children | adf6a9dcaded |
line wrap: on
line diff
--- a/src/undo.c +++ b/src/undo.c @@ -1405,10 +1405,15 @@ u_add_time(buf, buflen, tt) ex_undojoin(eap) exarg_T *eap; { + if (curbuf->b_u_newhead == NULL) + return; /* nothing changed before */ + if (curbuf->b_u_curhead != NULL) + { + EMSG(_("E790: undojoin is not allowed after undo")); + return; + } if (!curbuf->b_u_synced) return; /* already unsynced */ - if (curbuf->b_u_newhead == NULL) - return; /* nothing changed before */ if (p_ul < 0) return; /* no entries, nothing to do */ else