From f5b92f6c07a22064698f8ef66248bf1f418183a0 Mon Sep 17 00:00:00 2001
From: Bastian Rihm <brihm@intevation.de>
Date: Mon, 11 May 2026 17:33:15 +0200
Subject: [PATCH 1/3] Add test

---
 .../src/diff/index.spec.ts                    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/packages/openslides-motion-diff/src/diff/index.spec.ts b/packages/openslides-motion-diff/src/diff/index.spec.ts
index 3321380082..a8363506ef 100644
--- a/packages/openslides-motion-diff/src/diff/index.spec.ts
+++ b/packages/openslides-motion-diff/src/diff/index.spec.ts
@@ -1795,6 +1795,25 @@ describe(`MotionDiffService`, () => {
                 `<P class="os-split-before merge-before">${noMarkup(2)}first<ins> as</ins></p>`
             );
         });
+
+        // TODO: https://github.com/OpenSlides/openslides-client/issues/5912
+        it.skip(`test change within text formatting`, () => {
+            const inHtml = `<p>${noMarkup(1)}Test <strong>foo, test<br class="os-line-break">${noMarkup(2)}Test</strong></p>`;
+
+            expect(
+                getChangeDiff(
+                    inHtml,
+                    new TestChangeRecommendation({
+                        line_from: 1,
+                        line_to: 1,
+                        text: `<p>Test <strong>foo</strong></p>`
+                    }),
+                    85
+                )
+            ).toBe(
+                `<p>${noMarkup(1)}Test <strong>foo<del>, test</del><br class="os-line-break">${noMarkup(2)}Test</strong></p>`
+            );
+        });
     });
 
     describe(`getTextRemainderAfterLastChange`, () => {

From 57abdd765e938b9dce7a46f33361ff2e4fa25577 Mon Sep 17 00:00:00 2001
From: Bastian Rihm <brihm@intevation.de>
Date: Mon, 11 May 2026 17:33:36 +0200
Subject: [PATCH 2/3] Fix model mutation on edit dialog open

---
 .../motion-detail-diff/motion-detail-diff.component.ts       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-detail-diff/motion-detail-diff.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-detail-diff/motion-detail-diff.component.ts
index 2d91e928ac..224b4685f5 100644
--- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-detail-diff/motion-detail-diff.component.ts
+++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-detail-diff/motion-detail-diff.component.ts
@@ -15,6 +15,7 @@ import { MatMenuTrigger } from '@angular/material/menu';
 import { TooltipPosition } from '@angular/material/tooltip';
 import { TranslateService } from '@ngx-translate/core';
 import { Id } from 'src/app/domain/definitions/key-types';
+import { MotionChangeRecommendation } from 'src/app/domain/models/motions/motion-change-recommendation';
 import { LineNumberingMode } from 'src/app/domain/models/motions/motions.constants';
 import { BaseMeetingComponent } from 'src/app/site/pages/meetings/base/base-meeting.component';
 import { ViewMotion } from 'src/app/site/pages/meetings/pages/motions';
@@ -491,8 +492,8 @@ export class MotionDetailDiffComponent extends BaseMeetingComponent implements A
         $event.preventDefault();
         this.changeRecommendationMenu.closeMenu();
 
+        const recoModel = new MotionChangeRecommendation(reco.getModel());
         if (this.motion.text) {
-            const recoModel = reco.getModel();
             const motionText = this.diff.extractMotionLineRange(
                 this.lineNumberingService.insertLineNumbers({
                     html: this.motion.text,
@@ -517,7 +518,7 @@ export class MotionDetailDiffComponent extends BaseMeetingComponent implements A
                 from: reco.getLineFrom(),
                 to: reco.getLineTo()
             },
-            changeRecommendation: reco.getModel(),
+            changeRecommendation: recoModel,
             firstLine: reco.motion.firstLine
         };
         this.dialog.openContentChangeRecommendationDialog(data);

From a107702c167e2269013a5d66d2f63e3ae5eba59b Mon Sep 17 00:00:00 2001
From: Bastian Rihm <brihm@intevation.de>
Date: Mon, 11 May 2026 17:43:27 +0200
Subject: [PATCH 3/3] Add annotations to skipped tests

---
 packages/openslides-motion-diff/src/diff/index.spec.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/openslides-motion-diff/src/diff/index.spec.ts b/packages/openslides-motion-diff/src/diff/index.spec.ts
index a8363506ef..34057bc635 100644
--- a/packages/openslides-motion-diff/src/diff/index.spec.ts
+++ b/packages/openslides-motion-diff/src/diff/index.spec.ts
@@ -824,6 +824,7 @@ describe(`MotionDiffService`, () => {
             expect(diff).toBe(expected);
         });
 
+        // TODO: https://github.com/OpenSlides/openslides-client/issues/5856
         it.skip(`handles inserted text within nested lists`, () => {
             const before =
                     `<ul><li><span class="os-line-number line-number-1" data-line-number="1" contenteditable="false">&nbsp;</span>Ebene 1` +
@@ -847,6 +848,7 @@ describe(`MotionDiffService`, () => {
             expect(diff).toBe(expected);
         });
 
+        // TODO: https://github.com/OpenSlides/openslides-client/issues/5863
         it.skip(`handles changed text within nested lists (part 2)`, () => {
             const before = `<ul><li>Ebene 1` +
                     `<ul><li>Ebene 2.1` +