From 9754bc398c2f488995537f654208dccd0d5bb410 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= <spitz@lyx.org>
Date: Mon, 5 Nov 2007 07:15:12 +0000
Subject: [PATCH] * src/mathed/MathParser.cpp (getChar): 	- empty return
 if the char is not good() (fix bug 4318).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@21424 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/mathed/MathParser.cpp | 5 ++++-
 status.15x                | 6 ++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/mathed/MathParser.cpp b/src/mathed/MathParser.cpp
index 14b6339ffc..93e9fb579e 100644
--- a/src/mathed/MathParser.cpp
+++ b/src/mathed/MathParser.cpp
@@ -463,8 +463,11 @@ bool Parser::good() const
 
 char_type Parser::getChar()
 {
-	if (!good())
+	if (!good()) {
 		error("The input stream is not well...");
+		putback();
+		return char_type();
+	}
 	return tokens_[pos_++].character();
 }
 
diff --git a/status.15x b/status.15x
index 5da3bb93b4..b33a77c0f6 100644
--- a/status.15x
+++ b/status.15x
@@ -74,6 +74,8 @@ What's new
 
 - Fix a crash when some files or directories are not readable.
 
+- Fix a crash when pasting into a math formula (bug 4318).
+
 - Fix updating of externally modified files on Windows (bug 3172).
 
 - Repair wasy font such that it can also be used on Mac (bug 2326).
@@ -104,8 +106,8 @@ What's new
 
 - Really highlight search text (bug 3999).
 
-- Fix bug where the spellchecker didn't update the screen display on the last of
-  several misspelt words (bug 3586).
+- Fix a bug where the spellchecker didn't update the screen display on the last
+  of several misspelt words (bug 3586).
 
 - Do not close the error dialog on double click (bug 4090).