From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Thu, 29 Apr 2004 15:25:56 +0000 (+0000)
Subject: do not stop parsing bind files when an error occurs (bug 1575); small stuff
X-Git-Tag: 1.6.10~15260
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=250d7506c6783120b6f4244f2309bd727e2b1adb;p=lyx.git

do not stop parsing bind files when an error occurs (bug 1575); small stuff


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8712 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/lib/CREDITS b/lib/CREDITS
index 15284035a4..d3052597a4 100644
--- a/lib/CREDITS
+++ b/lib/CREDITS
@@ -85,7 +85,7 @@ IE-mail: ron@18james.com
 @bHartmut Goebel
 @iE-mail: goebel@noris.net
    Improvements to Koma-Script classes
-@bHartmut Haase
+@bHartmut Haase (HHa)
 @iE-mail: hha4491@atomstromfrei.de
    German translation of the documentation
 @bHelge Hafting 
diff --git a/lib/ChangeLog b/lib/ChangeLog
index 1aadec9713..1b69626888 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-23  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* CREDITS: update Hartmut Haase's entry
+
 2004-04-29  Angus Leeming  <leeming@lyx.org>
 
 	* external_templates: add some commentary to the RasterImage
diff --git a/src/ChangeLog b/src/ChangeLog
index fd0d4759e3..a142cabb5e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2004-04-29  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* debug.C (showLevel): do not forget the end-of-line marker
+
+2004-04-27  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* kbmap.C (read): do not stop parsing a bind file when an error
+	occurs (bug 1575)
+
 2004-04-29  Angus Leeming  <leeming@lyx.org>
 
 	* cursor.C:
diff --git a/src/debug.C b/src/debug.C
index f0bace4332..576b95bf9c 100644
--- a/src/debug.C
+++ b/src/debug.C
@@ -108,9 +108,11 @@ void lyx_debug_trait::showLevel(ostream & os, lyx_debug_trait::type level)
 			// avoid _(...) re-entrance problem
 			string const s = _(errorTags[i].desc);
 			os << bformat(_("Debugging `%1$s' (%2$s)"),
-					errorTags[i].name, s);
+					errorTags[i].name, s)
+			   << '\n';
 		}
 	}
+	os.flush();
 }
 
 
diff --git a/src/kbmap.C b/src/kbmap.C
index 81fb706068..e494868c77 100644
--- a/src/kbmap.C
+++ b/src/kbmap.C
@@ -112,7 +112,7 @@ bool kb_keymap::read(string const & bind_file)
 	lyxerr[Debug::KBMAP] << "Reading bind file:" << tmp << endl;
 
 	bool error = false;
-	while (!error && lexrc.isOK()) {
+	while (lexrc.isOK()) {
 		switch (lexrc.lex()) {
 		case LyXLex::LEX_UNDEF:
 			lexrc.printError("Unknown tag `$$Token'");
@@ -154,7 +154,7 @@ bool kb_keymap::read(string const & bind_file)
 		case BN_BINDFILE:
 			if (lexrc.next()) {
 				string const tmp(lexrc.getString());
-				error = !read(tmp);
+				error |= !read(tmp);
 			} else {
 				lexrc.printError("BN_BINDFILE: Missing file name");
 				error = true;