From 0e64c8ab7af2b1b238c6864ce3a09b6b0948cad5 Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Wed, 27 May 2015 17:04:10 +0200
Subject: [PATCH] Fix bad font toggling after the layout has been changed.

When changing the paragraph layout, it is a good idea to call
{{{Cursor::setCurrentFont()}}} to make sure that all is in order.

Fixes bug #4394.
---
 src/Text2.cpp | 1 +
 status.21x    | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/Text2.cpp b/src/Text2.cpp
index b989fd7bdc..5f4ca2f4e9 100644
--- a/src/Text2.cpp
+++ b/src/Text2.cpp
@@ -200,6 +200,7 @@ void Text::setLayout(Cursor & cur, docstring const & layout)
 	pit_type end = cur.selEnd().pit() + 1;
 	cur.recordUndoSelection();
 	setLayout(start, end, layout);
+	cur.setCurrentFont();
 	cur.forceBufferUpdate();
 }
 
diff --git a/status.21x b/status.21x
index 5b2acde43b..badbe7a04c 100644
--- a/status.21x
+++ b/status.21x
@@ -158,6 +158,8 @@ What's new
 
 - Fix cursor font after undoing a font-changing command (bug 9537).
 
+- Fix bad cursor font in some cases after changing layout (bug 4394).
+
 - Fix name and hint of figure captions in documents using the class aastex.
 
 - Fix output encoding information for non-TeX fonts XeTeX/LuaTeX on preview