X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.cpp;h=e28d8fc9785873de5b8d8733a2163d117b502870;hb=1ab314f8e6e145dc73d0a26b7e82a280b497ea3c;hp=69eef18615c3fec8c5a43a5ef50dcdbdc669dc18;hpb=6cdf6bd6ab12d320662ae76bc332d214e11ca6b2;p=lyx.git

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index 69eef18615..e28d8fc978 100644
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -27,7 +27,6 @@
 #include "CoordCache.h"
 #include "Cursor.h"
 #include "CutAndPaste.h"
-#include "support/debug.h"
 #include "FontIterator.h"
 #include "FuncRequest.h"
 #include "InsetList.h"
@@ -49,6 +48,8 @@
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
+#include "support/debug.h"
+
 using namespace std;
 
 namespace lyx {
@@ -1709,6 +1710,7 @@ int TextMetrics::leftMargin(int max_width,
 			if (pars[newpar].layout()->isEnvironment()) {
 				l_margin = leftMargin(max_width, newpar);
 			}
+			//FIXME Should this check for emptyLayout() as well?
 			if (par.layout() == tclass.defaultLayout()) {
 				if (pars[newpar].params().noindent())
 					parindent.erase();
@@ -1830,7 +1832,7 @@ int TextMetrics::leftMargin(int max_width,
 	    && !(!par.empty()
 		    && par.isInset(pos)
 		    && par.getInset(pos)->display())
-	    && (par.layout() != tclass.defaultLayout()
+	    && (par.layout() != tclass.defaultLayout() //should this check emptyLayout()?
 		|| buffer.params().paragraph_separation ==
 		   BufferParams::PARSEP_INDENT))
 	{