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 15284035a4be7ef5de94f8daf4a670e6352d8271..d3052597a40a14fb480e7e21a13538eff7e79e98 100644 (file)
--- 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 1aadec9713c384857c94d8e67f6b67749e6a6c2e..1b69626888b7ed294f55820414cf91999abdfc27 100644 (file)
--- 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 fd0d4759e34b188cd8f16c7115818aee85574284..a142cabb5e3a4f31e1b0ee875c7e0ce7159c4a3d 100644 (file)
--- 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 f0bace4332b21e384b4c6cc0e93266e72358b72d..576b95bf9c40b0fa6fa9263fe1baf2621de70af7 100644 (file)
--- 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 81fb7060685d091d118f8d65ca3b1e0b46368f77..e494868c77e305b044a4a80e4c0cd93a55acfd97 100644 (file)
--- 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;