comparison 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
comparison
equal deleted inserted replaced
838:8e5830943bff 839:1f3b1021f002
1403 /*ARGSUSED*/ 1403 /*ARGSUSED*/
1404 void 1404 void
1405 ex_undojoin(eap) 1405 ex_undojoin(eap)
1406 exarg_T *eap; 1406 exarg_T *eap;
1407 { 1407 {
1408 if (curbuf->b_u_newhead == NULL)
1409 return; /* nothing changed before */
1410 if (curbuf->b_u_curhead != NULL)
1411 {
1412 EMSG(_("E790: undojoin is not allowed after undo"));
1413 return;
1414 }
1408 if (!curbuf->b_u_synced) 1415 if (!curbuf->b_u_synced)
1409 return; /* already unsynced */ 1416 return; /* already unsynced */
1410 if (curbuf->b_u_newhead == NULL)
1411 return; /* nothing changed before */
1412 if (p_ul < 0) 1417 if (p_ul < 0)
1413 return; /* no entries, nothing to do */ 1418 return; /* no entries, nothing to do */
1414 else 1419 else
1415 { 1420 {
1416 /* Go back to the last entry */ 1421 /* Go back to the last entry */