X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraph.cpp;h=c9a234d01fbed9aefa93e7292d3fe91130edfffd;hb=7a7c2117bfb2037495f2642555651962851a9bba;hp=309c20caffc442873690df490b044340bd997236;hpb=094341fa5a9597775a7adae723223e7580ab6b3a;p=lyx.git

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 309c20caff..c9a234d01f 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -1505,7 +1505,8 @@ void Paragraph::Private::validate(LaTeXFeatures & features) const
 		if (c == 0x0022) {
 			if (features.runparams().isFullUnicode() && bp.useNonTeXFonts)
 				features.require("textquotedblp");
-			else if (bp.main_font_encoding() != "T1")
+			else if (bp.main_font_encoding() != "T1"
+				 || ((&owner_->getFontSettings(bp, i))->language()->internalFontEncoding()))
 				features.require("textquotedbl");
 		}
 		BufferEncodings::validate(c, features);
@@ -3870,13 +3871,13 @@ void Paragraph::locateWord(pos_type & from, pos_type & to,
 			to = from;
 			return;
 		}
-		// no break here, we go to the next
+		// fall through
 
 	case WHOLE_WORD:
 		// If we are already at the beginning of a word, do nothing
 		if (!from || isWordSeparator(from - 1))
 			break;
-		// no break here, we go to the next
+		// fall through
 
 	case PREVIOUS_WORD:
 		// always move the cursor to the beginning of previous word