From: Uwe Stöhr <uwestoehr@lyx.org>
Date: Wed, 5 Nov 2014 23:31:42 +0000 (+0100)
Subject: InsetFootlike.cpp: disallow to use listings in foot-like insets
X-Git-Tag: 2.1.3~95
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=aa82c1cc19aeed31feb3da48f3b127d11b4b4ed6;p=features.git

InsetFootlike.cpp: disallow to use listings in foot-like insets

- fixes bug #9321 also for branch
---

diff --git a/src/insets/InsetFootlike.cpp b/src/insets/InsetFootlike.cpp
index afd2329530..05d2ba8717 100644
--- a/src/insets/InsetFootlike.cpp
+++ b/src/insets/InsetFootlike.cpp
@@ -57,7 +57,8 @@ void InsetFootlike::write(ostream & os) const
 
 bool InsetFootlike::insetAllowed(InsetCode code) const
 {
-	if (code == FOOT_CODE || code == MARGIN_CODE || code == FLOAT_CODE)
+	if (code == FOOT_CODE || code == MARGIN_CODE || code == FLOAT_CODE
+		|| code == LISTINGS_CODE)
 		return false;
 	return InsetCollapsable::insetAllowed(code);
 }
diff --git a/status.21x b/status.21x
index 477596c64f..c38e3b4778 100644
--- a/status.21x
+++ b/status.21x
@@ -94,6 +94,8 @@ What's new
 - Fix mapping of ISO_Left_Tab key, which was erroneously assigned to Tab
   (instead of BackTab).
 
+- Disallow to insert program listings to footnotes and margin notes (bug 9321).
+
 
 * INTERNALS