From e0466fe56bcf0fcb650b4574ddf8a3f7da1990d2 Mon Sep 17 00:00:00 2001
From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Sat, 21 Nov 2009 15:09:10 +0000
Subject: [PATCH] Do not allow a program listing to be in a font changing
 command.

see r32124.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@32126 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/insets/InsetListings.h | 2 ++
 status.16x                 | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/insets/InsetListings.h b/src/insets/InsetListings.h
index 5396b7d0e1..6a02ddccc8 100644
--- a/src/insets/InsetListings.h
+++ b/src/insets/InsetListings.h
@@ -41,6 +41,8 @@ private:
 	///
 	bool isLabeled() const { return true; }
 	///
+	bool noFontChange() const { return true; }
+	///
 	InsetCode lyxCode() const { return LISTINGS_CODE; }
 	/// lstinline is inlined, normal listing is displayed
 	DisplayType display() const;
diff --git a/status.16x b/status.16x
index 08f7508a0e..6744230a6f 100644
--- a/status.16x
+++ b/status.16x
@@ -180,6 +180,8 @@ What's new
 
 - Include packages for commands used within a \boxed (bug 6297).
 
+- Close font-changing commands before a program listing.
+
 
 * USER INTERFACE