From 226c6f6b171da311bb74cacbd0f9b0660d6b3469 Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Tue, 10 Mar 2015 16:05:22 +0100
Subject: [PATCH] Take in account the parent's getStatus in macro templates

This avoids invoking the insert space dialog instead of the math version. Thereafter, spaces are correctly inserted inside macro templates.

This is the last part of the fix to #9432.
---
 src/mathed/MathMacroTemplate.cpp | 4 ++--
 status.21x                       | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/mathed/MathMacroTemplate.cpp b/src/mathed/MathMacroTemplate.cpp
index 606ac2c5d3..d306d8c621 100644
--- a/src/mathed/MathMacroTemplate.cpp
+++ b/src/mathed/MathMacroTemplate.cpp
@@ -1071,7 +1071,7 @@ void MathMacroTemplate::doDispatch(Cursor & cur, FuncRequest & cmd)
 }
 
 
-bool MathMacroTemplate::getStatus(Cursor & /*cur*/, FuncRequest const & cmd,
+bool MathMacroTemplate::getStatus(Cursor & cur, FuncRequest const & cmd,
 	FuncStatus & flag) const
 {
 	bool ret = true;
@@ -1129,7 +1129,7 @@ bool MathMacroTemplate::getStatus(Cursor & /*cur*/, FuncRequest const & cmd,
 			break;
 
 		default:
-			ret = false;
+			ret = InsetMathNest::getStatus(cur, cmd, flag);
 			break;
 	}
 	return ret;
diff --git a/status.21x b/status.21x
index 0d790ea08a..0a43706c1a 100644
--- a/status.21x
+++ b/status.21x
@@ -85,6 +85,10 @@ What's new
 
 - Fix crash when closing LyX on MacOS X (bug 8637).
 
+- Fix crash with undo/redo (bug 9432).
+
+- Fix insertion of spaces in macro definitions (bug 9432).
+
 - Fix name and hint of figure captions in documents using the class aastex.
 
 - Fix output encoding information for non-TeX fonts XeTeX/LuaTeX on preview