From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Mon, 7 Oct 2019 13:10:52 +0000 (+0200)
Subject: typo
X-Git-Tag: lyx-2.4.0dev-acb2ca7b~1503
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=3b642cd0edee1d8e954a3e8ef568d13fd15ab3b4;hp=bdf58b77e7bebce6e9554151a909a5ee62be439f;p=lyx.git

typo
---

diff --git a/src/frontends/qt/GuiWorkArea.cpp b/src/frontends/qt/GuiWorkArea.cpp
index e2772fbb60..07ad690469 100644
--- a/src/frontends/qt/GuiWorkArea.cpp
+++ b/src/frontends/qt/GuiWorkArea.cpp
@@ -133,7 +133,7 @@ public:
 		x_(0), caret_width_(0)
 	{}
 
-	/* Draw he caret. Parameter \c horiz_offset is not 0 when there
+	/* Draw the caret. Parameter \c horiz_offset is not 0 when there
 	 * has been horizontal scrolling in current row
 	 */
 	void draw(QPainter & painter, int horiz_offset)
diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 4124d2dd1c..4fcc49b303 100644
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -1439,6 +1439,7 @@ void TeXOnePar(Buffer const & buf,
 				&& nextpar->getDepth() > par.getDepth()
 				&& nextpar->getAlign(bparams) == next_layout.align)
 			    || (!style.isEnvironment()
+				&& !tclass.isDefaultLayout(style)
 				&& next_layout.latextype == LATEX_ENVIRONMENT
 				&& nextpar->getDepth() < par.getDepth())
 			    || (style.isCommand()