diff --git a/modules/code-formatting.xml b/modules/code-formatting.xml
index d24c19b..2a5b5f4 100755
--- a/modules/code-formatting.xml
+++ b/modules/code-formatting.xml
@@ -98,6 +98,11 @@
 			</xsl:if>
 			<xsl:call-template name="newline-internal" />
 			<xsl:text>\begin{lstlisting}</xsl:text>
+			<!--
+				Note that code-block shouldn't be used for code that's really inline (in other words, don't create a code-block element that occurs all on the same line). Otherwise, the template generates a lstlisting environment with the \begin, code \end all on the same line, which eventually gives LaTeX severe indigestion.
+				
+				We can't just do the obvious fix of wrapping newlines around the code, because this messes up code that actually /does/ have newlines at the start or end by adding extra whitespace.
+			-->
 			<xsl:if test="@language">
 				<xsl:text>[language=</xsl:text>
 				<xsl:value-of select="@language" />