From 3261bad69e1f0c901ee78c6747f1bab68c482da7 Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Tue, 29 Jul 2003 09:43:15 +0000
Subject: [PATCH] fix bug when reading bind files

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7438 a592a061-630c-0410-9148-cb99ea01b6c8
---
 po/POTFILES.in |  1 -
 src/ChangeLog  |  4 ++++
 src/kbmap.C    | 27 +++++++++++++++++----------
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index b03accf318..87864eb78a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -179,7 +179,6 @@ src/mathed/ref_inset.C
 src/paragraph.C
 src/paragraph_funcs.C
 src/rowpainter.C
-src/support/path_defines.C
 src/text.C
 src/text2.C
 src/text3.C
diff --git a/src/ChangeLog b/src/ChangeLog
index 4a82b3151a..a27cb2fd89 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-29  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* kbmap.C (read): fix error message when reading bind files
+
 2003-07-29  Angus Leeming  <leeming@lyx.org>
 
 	* BufferView.[Ch] (ChangeCitationsIfUnique): This function most
diff --git a/src/kbmap.C b/src/kbmap.C
index e1a0cce71e..7f8fd03116 100644
--- a/src/kbmap.C
+++ b/src/kbmap.C
@@ -93,15 +93,20 @@ bool kb_keymap::read(string const & bind_file)
 
 	string const tmp = i18nLibFileSearch("bind", bind_file, "bind");
 	lexrc.setFile(tmp);
-	if (!lexrc.isOK()) return false;
+	if (!lexrc.isOK()) {
+		lyxerr << "kb_keymap::read: cannot open bind file:" 
+		       << tmp << endl;
+		return false;
+	}
 
-	lyxerr[Debug::KBMAP] << "Reading bindfile:" << tmp << endl;
+	lyxerr[Debug::KBMAP] << "Reading bind file:" << tmp << endl;
 
 	bool error = false;
-	while (lexrc.isOK()) {
+	while (!error && lexrc.isOK()) {
 		switch (lexrc.lex()) {
 		case LyXLex::LEX_UNDEF:
 			lexrc.printError("Unknown tag `$$Token'");
+			error = true;
 			continue;
 		case LyXLex::LEX_FEOF:
 			continue;
@@ -113,6 +118,7 @@ bool kb_keymap::read(string const & bind_file)
 				seq = lexrc.getString();
 			} else {
 				lexrc.printError("BN_BIND: Missing key sequence");
+				error = true;
 				break;
 			}
 			
@@ -120,6 +126,7 @@ bool kb_keymap::read(string const & bind_file)
 				cmd = lexrc.getString();
 			} else {
 				lexrc.printError("BN_BIND: missing command");
+				error = true;
 				break;
 			}
 			
@@ -127,16 +134,17 @@ bool kb_keymap::read(string const & bind_file)
 			if (!action == LFUN_UNKNOWN_ACTION) {
 				lexrc.printError("BN_BIND: Unknown LyX"
 						 " function `$$Token'");
+				error = true;
 				break;
 			}
 			
-			error = (bind(seq, kb_action(action)) != string::npos);
+			bind(seq, kb_action(action));
 			break;
 		}
 		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;
@@ -147,11 +155,10 @@ bool kb_keymap::read(string const & bind_file)
 		}
 	}
 
-	if (error) {
-		lyxerr << "Error reading bind file: " << tmp << endl;
-	}
-
-	return error;
+	if (error)
+		lyxerr << "kb_keymap::read: error while reading bind file:" 
+		       << tmp << endl;
+	return !error;
 }
 
 
-- 
2.39.2