Kill macro mode when using LFUN_ESCAPE

Add a `cancel' boolean to macroModeClose() that just removes all trace
of what has been entered instead of finalizing it.

When entering a macro in mathed, let LFUN_ESCAPE invoke
macroModeClose(true). The new semantics of LFUN_ESCAPE in mathed is
thus to abort the input of a macro name.

Fixes bug #9251.

(cherry picked from commit 9296344b9a)

src/Cursor.cpp

@@ -1528,7 +1528,7 @@ bool Cursor::down()
 }
 
 
-bool Cursor::macroModeClose()
+bool Cursor::macroModeClose(bool cancel)
 {
 	if (!inMacroMode())
 		return false;
@@ -1541,7 +1541,7 @@ bool Cursor::macroModeClose()
 	cell().erase(pos());
 
 	// do nothing if the macro name is empty
-	if (s == "\\")
+	if (s == "\\" || cancel)
 		return false;
 
 	// trigger updates of macros, at least, if no full

src/Cursor.h

@@ -488,9 +488,9 @@ public:
 	void setScreenPos(int x, int y);
 	/// current offset in the top cell
 
-	/// interpret name a name of a macro. Returns true if
-	/// something got inserted.
-	bool macroModeClose();
+	/// interpret name of a macro or ditch it if \c cancel is true.
+	/// Returns true if something got inserted.
+	bool macroModeClose(bool cancel = false);
 	/// are we currently typing the name of a macro?
 	bool inMacroMode() const;
 	/// get access to the macro we are currently typing

src/mathed/InsetMathNest.cpp

@@ -869,10 +869,14 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd)
 	case LFUN_ESCAPE:
 		if (cur.selection())
 			cur.clearSelection();
+		else  {
+			if (cur.inMacroMode())
+				cur.macroModeClose(true);
 			else {
 				cmd = FuncRequest(LFUN_FINISHED_FORWARD);
 				cur.undispatched();
 			}
+		}
 		break;
 
 	// 'Locks' the math inset. A 'locked' math inset behaves as a unit

status.22x

@@ -152,6 +152,9 @@ What's new
 
 - Fix untranslated GUI strings on View/Update toolbar button menu (bug 11040).
 
+- When entering a math macro name, Escape properly cancels the
+  operation (bug 9251).
+
 
 * INTERNALS