Mercurial > vim

diff src/change.c @ 16972:5493e31010e1 v8.1.1486

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1486: a listener change is merged even when it adds a line commit https://github.com/vim/vim/commit/125370459178b0ca3acc98edca774c390c9b9fa4 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Jun 6 22:50:35 2019 +0200 patch 8.1.1486: a listener change is merged even when it adds a line Problem: A listener change is merged even when it adds a line. (Paul Jolly) Solution: Do not merge a change that adds or removes a line. (closes https://github.com/vim/vim/issues/4490)
author Bram Moolenaar <Bram@vim.org>
date Thu, 06 Jun 2019 23:00:07 +0200
parents a836d122231a
children d5e1e09a829f
line wrap: on
line diff
--- a/src/change.c
+++ b/src/change.c
@@ -186,6 +186,7 @@ check_recorded_changes(
 		    || (prev_lnume >= lnum && xtra != 0))
 	    {
 		if (li->li_next == NULL && lnum == prev_lnum
+			&& xtra == 0
 			&& col + 1 == (colnr_T)dict_get_number(
 				      li->li_tv.vval.v_dict, (char_u *)"col"))
 		{