X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText2.cpp;h=ae82050fce1c5ca7b00cc83a1bf6b98ee3090ce0;hb=62411b7c0f5073d77df46cb0c8a5baacd0dfce7c;hp=24a3317cf7cafcf14c7438dcd739b22574ea3d8b;hpb=152491f9162604dc2060158b497c756b635d4d29;p=lyx.git

diff --git a/src/Text2.cpp b/src/Text2.cpp
index 24a3317cf7..ae82050fce 100644
--- a/src/Text2.cpp
+++ b/src/Text2.cpp
@@ -167,7 +167,7 @@ void Text::setInsetFont(BufferView const & bv, pit_type pit,
 		pos_type pos, Font const & font, bool toggleall)
 {
 	Inset * const inset = pars_[pit].getInset(pos);
-	LASSERT(inset && inset->noFontChange(), /**/);
+	LASSERT(inset && inset->resetFontEdit(), /**/);
 
 	CursorSlice::idx_type endidx = inset->nargs();
 	for (CursorSlice cs(*inset); cs.idx() != endidx; ++cs.idx()) {
@@ -345,11 +345,9 @@ void Text::setFont(BufferView const & bv, CursorSlice const & begin,
 		pit_type const pit = dit.pit();
 		pos_type const pos = dit.pos();
 		Inset * inset = pars_[pit].getInset(pos);
-		if (inset && inset->noFontChange()) {
+		if (inset && inset->resetFontEdit()) {
 			// We need to propagate the font change to all
-			// text cells of the inset (bug 1973).
-			// FIXME: This should change, see documentation
-			// of noFontChange in Inset.h
+			// text cells of the inset (bugs 1973, 6919).
 			setInsetFont(bv, pit, pos, font, toggleall);
 		}
 		TextMetrics const & tm = bv.textMetrics(this);