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 afd23295307bb8d33da8bc6b29f4219728108ca9..05d2ba87173ac1fade4d569cef061be8c1b9a0fa 100644 (file)
--- 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 477596c64f1e07240c30bd0682fed16a1784a21d..c38e3b47780b496450b5b7fb5f7ca3493e737d32 100644 (file)
--- 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