anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-12 16:50:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "InsetFootlike.cpp: disable listings inside footnotes"

Browse Source 
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 aa82c1cc19.
This commit is contained in:
Scott Kostyshak 2015-12-08 14:41:23 -05:00
parent 6c41cd1d14
commit 20a70d3aba
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/insets/InsetFootlike.cpp
View File

@ -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);
}

3
status.21x
View File

@ -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