aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthew Malcomson <hardenedapple@gmail.com>2017-01-03 21:10:38 +0000
committerMatthew Malcomson <hardenedapple@gmail.com>2017-01-22 21:19:46 +0000
commite0e4825897cdfcd2d125240321ec2980a40f7951 (patch)
tree338ac612827dbe01a18bc58b87e6dd55ce2499cd /src
parent7255f00818af5e8e552e9beac2c9f5ccb86de664 (diff)
downloadrneovim-e0e4825897cdfcd2d125240321ec2980a40f7951.tar.gz
rneovim-e0e4825897cdfcd2d125240321ec2980a40f7951.tar.bz2
rneovim-e0e4825897cdfcd2d125240321ec2980a40f7951.zip
Don't set b_u_curhead in ex_undojoin()
vim-patch:8.0.0205 This provides no benefit, and introduces some bugs.
Diffstat (limited to 'src')
-rw-r--r--src/nvim/undo.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/nvim/undo.c b/src/nvim/undo.c
index 4d56046bc1..f693f20f2d 100644
--- a/src/nvim/undo.c
+++ b/src/nvim/undo.c
@@ -2549,20 +2549,20 @@ static void u_add_time(char_u *buf, size_t buflen, time_t tt)
*/
void ex_undojoin(exarg_T *eap)
{
- if (curbuf->b_u_newhead == NULL)
- return; /* nothing changed before */
+ 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 (get_undolevel() < 0)
- return; /* no entries, nothing to do */
- else {
- /* Go back to the last entry */
- curbuf->b_u_curhead = curbuf->b_u_newhead;
- curbuf->b_u_synced = false; /* no entries, nothing to do */
+ if (!curbuf->b_u_synced) {
+ return; // already unsynced
+ }
+ if (get_undolevel() < 0) {
+ return; // no entries, nothing to do
+ } else {
+ curbuf->b_u_synced = false; // Append next change to last entry
}
}