0
0
mirror of https://github.com/vim/vim.git synced 2025-09-30 04:44:14 -04:00

updated for version 7.0020

This commit is contained in:
Bram Moolenaar
2004-10-24 19:18:58 +00:00
parent 47136d70fa
commit 009b2592f7
33 changed files with 3218 additions and 1957 deletions

View File

@@ -185,10 +185,18 @@ u_savecommon(top, bot, newbot)
* Netbeans defines areas that cannot be modified. Bail out here when
* trying to change text in a guarded area.
*/
if (usingNetbeans && netbeans_is_guarded(top, bot))
if (usingNetbeans)
{
EMSG(_(e_guarded));
return FAIL;
if (netbeans_is_guarded(top, bot))
{
EMSG(_(e_guarded));
return FAIL;
}
if (curbuf->b_p_ro)
{
EMSG(_(e_nbreadonly));
return FAIL;
}
}
#endif
@@ -693,6 +701,10 @@ u_undoredo()
if (old_flags & UH_CHANGED)
changed();
else
#ifdef FEAT_NETBEANS_INTG
/* per netbeans undo rules, keep it as modified */
if (!isNetbeansModified(curbuf))
#endif
unchanged(curbuf, FALSE);
/*