Author: spitz
Date: Fri Oct 28 08:33:39 2011
New Revision: 40046
URL: http://www.lyx.org/trac/changeset/40046
Log:
Fix #7816: Edit->Table incorrectly activated inside index entries
Modified:
lyx-devel/branches/BRANCH_2_0_X/src/insets/InsetIndex.cpp
lyx-devel/branches/BRANCH_2_0_X/status.20x
Modified: lyx-devel/branches/BRANCH_2_0_X/src/insets/InsetIndex.cpp
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/src/insets/InsetIndex.cpp Thu Oct 27
22:00:11 2011 (r40045)
+++ lyx-devel/branches/BRANCH_2_0_X/src/insets/InsetIndex.cpp Fri Oct 28
08:33:39 2011 (r40046)
@@ -244,8 +244,7 @@
from_utf8(cmd.getArg(1)) == params_.index);
return true;
}
- flag.setEnabled(true);
- return true;
+ return InsetCollapsable::getStatus(cur, cmd, flag);
case LFUN_INSET_DIALOG_UPDATE: {
Buffer const & realbuffer = *buffer().masterBuffer();
Modified: lyx-devel/branches/BRANCH_2_0_X/status.20x
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/status.20x Thu Oct 27 22:00:11 2011
(r40045)
+++ lyx-devel/branches/BRANCH_2_0_X/status.20x Fri Oct 28 08:33:39 2011
(r40046)
@@ -191,11 +191,14 @@
- Allow the \nocite LaTeX command when using the basic citation engine.
-- tex2lyx does not produce invalid Flex insets anymore (bug 7780)
+- tex2lyx does not produce invalid Flex insets anymore (bug 7780).
-- Fix import of required arguments of standard environments (part of bug 7468)
+- Fix import of required arguments of standard environments (part of bug
+ 7468).
-- Fix display of section (etc) headings, in both TOC and menu, when there is
+- Do not incorrectly activate Edit->Table inside index entries (bug 7816).
+
+- Fix display of section (etc.) headings, in both TOC and menu, when there is
math in the title.
- Correct handling of custom width in the nomenclature dialog (bug 7853).
