From d831370ed46b3a76fb1fcf30abd6d68fb5e04442 Mon Sep 17 00:00:00 2001
From: Ed Sanders <esanders@wikimedia.org>
Date: Fri, 22 Jan 2021 17:35:36 +0000
Subject: [PATCH] Update VE core submodule to master (ca6a97f42)

New changes:
4589f5f00 Clear node offset cache when leaving read-only mode
68b0f8372 Show attribute changes as diffs when appropriate

Local changes:
Pull through for Ic6ec7f5ebabc912235ff7e688425f415f2c3ff20

Bug: T272603
Change-Id: I574fc56799ed165e63e16881429c4ed740850234
---
 extension.json                                   | 3 +++
 lib/ve                                           | 2 +-
 modules/ve-mw/tests/ui/ve.ui.DiffElement.test.js | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/extension.json b/extension.json
index d7988718b8..04b41d12f3 100644
--- a/extension.json
+++ b/extension.json
@@ -2247,11 +2247,14 @@
 			"messages": [
 				"visualeditor-changedesc-align",
 				"visualeditor-changedesc-changed",
+				"visualeditor-changedesc-changed-diff",
 				"visualeditor-changedesc-comment",
+				"visualeditor-changedesc-comment-diff",
 				"visualeditor-changedesc-image-size",
 				"visualeditor-changedesc-language",
 				"visualeditor-changedesc-link-added",
 				"visualeditor-changedesc-link-href",
+				"visualeditor-changedesc-link-href-diff",
 				"visualeditor-changedesc-link-removed",
 				"visualeditor-changedesc-no-key",
 				"visualeditor-changedesc-set",
diff --git a/lib/ve b/lib/ve
index 98c07ef951..ca6a97f429 160000
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit 98c07ef9519f3dd74de70cfc52a8c35410dde199
+Subproject commit ca6a97f4294e6ffb0c8bdfb9429fa92e0b4b9962
diff --git a/modules/ve-mw/tests/ui/ve.ui.DiffElement.test.js b/modules/ve-mw/tests/ui/ve.ui.DiffElement.test.js
index 5dedb5170e..fb43dc9b61 100644
--- a/modules/ve-mw/tests/ui/ve.ui.DiffElement.test.js
+++ b/modules/ve-mw/tests/ui/ve.ui.DiffElement.test.js
@@ -24,7 +24,7 @@ QUnit.test( 'Diffing', function ( assert ) {
 					'</div>',
 				expectedDescriptions: [
 					'<div>visualeditor-changedesc-mwtransclusion</div>' +
-					'<div><ul><li>visualeditor-changedesc-changed,1,<del>Hello, world!</del>,<ins>Hello, globe!</ins></li></ul></div>'
+					'<div><ul><li>visualeditor-changedesc-changed-diff,1,<span>Hello, <del>world</del><ins>globe</ins>!</span></li></ul></div>'
 				]
 			},
 			{