commit 20a70d3aba455dad95e84d5c4130dbf7b6a0bf24
Author: Scott Kostyshak <[email protected]>
Date: Tue Dec 8 14:41:23 2015 -0500
Revert "InsetFootlike.cpp: disable listings inside footnotes"
Although aa82c1cc fixed #9321, it broke a valid use case that was
reported by a user at #9785. Hopefully we can come up with a better
fix for #9321.
This reverts commit aa82c1cc19aeed31feb3da48f3b127d11b4b4ed6.
diff --git a/src/insets/InsetFootlike.cpp b/src/insets/InsetFootlike.cpp
index cb92320..5685e86 100644
--- a/src/insets/InsetFootlike.cpp
+++ b/src/insets/InsetFootlike.cpp
@@ -61,8 +61,7 @@ void InsetFootlike::write(ostream & os) const
bool InsetFootlike::insetAllowed(InsetCode code) const
{
- if (code == FOOT_CODE || code == MARGIN_CODE || code == FLOAT_CODE
- || code == LISTINGS_CODE)
+ if (code == FOOT_CODE || code == MARGIN_CODE || code == FLOAT_CODE)
return false;
return InsetCollapsable::insetAllowed(code);
}
diff --git a/status.21x b/status.21x
index a52bdaa..0f8a2b2 100644
--- a/status.21x
+++ b/status.21x
@@ -116,6 +116,9 @@ What's new
- Disable Apply button in InsetParams dialogs if there is no inset to apply
to (bug 9386).
+- Allow to insert program listings to footnotes and margin notes (fixes bug
+ 9785, but reintroduces bug 9321).
+
* INTERNALS