From 39e8cbf4e59b060e32e993574369f0eb9a88c9ce Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Tue, 5 Jul 2016 16:22:49 +0200
Subject: [PATCH] Record undo when deleting end of paragraph in change tracking
 mode

Fixes bug #10253.
(cherry picked from commit 86c33c96a0dd026148f79b7da96fee5a0bb705bc)
---
 src/Text.cpp | 1 +
 status.22x   | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/src/Text.cpp b/src/Text.cpp
index 416a67bf0d..a47d4b1c52 100644
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -1611,6 +1611,7 @@ bool Text::erase(Cursor & cur)
 			return dissolveInset(cur);
 
 		if (!par.isMergedOnEndOfParDeletion(cur.buffer()->params().track_changes)) {
+			cur.recordUndo(DELETE_UNDO);
 			par.setChange(cur.pos(), Change(Change::DELETED));
 			cur.forwardPos();
 			needsUpdate = true;
diff --git a/status.22x b/status.22x
index c088d1f8b7..dd7c29765d 100644
--- a/status.22x
+++ b/status.22x
@@ -141,6 +141,9 @@ What's new
 - Fix cursor position after Redo of a document settings change (bug
   10097).
 
+- Handle undo after deleting end of paragraph in change tracking mode
+  (bug 10253).
+
 - Disable Edit > Dissolve Inset in tabulars (bug 9954).
 
 - Shortcut preferences: ask the user for removing bindings when using the