small fixes after latin patch

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

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 349cc293f5efa1cd667aa1d53d4852eb974afd37..d9ef3e463c1c14a6997c84860050932dae1a38be 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-16  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * bind/latinkeys.bind: fix typo
+
 2001-05-11  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
        * bind/latinkeys.bind: new file. bindings for latin1, latin2,

diff --git a/lib/bind/latinkeys.bind b/lib/bind/latinkeys.bind
index 596a7abfb1927e0e56526f7cc0868794f2a26308..4b320b8b41afdea7a5d63ad7ca17d77e1e4449a0 100644 (file)
--- a/lib/bind/latinkeys.bind
+++ b/lib/bind/latinkeys.bind
@@ -235,7 +235,7 @@
 \bind "Ecaron"                 "accent-caron E"
 \bind "Dcaron"                 "accent-caron D"
 \bind "Dstroke"                        "self-insert"
-\bind "Nacute"                 "accent-actue N"
+\bind "Nacute"                 "accent-acute N"
 \bind "Ncaron"                 "accent-caron N"
 \bind "Odoubleacute"           "accent-hungarian-umlaut O"
 \bind "Rcaron"                 "accent-caron R"

diff --git a/src/ChangeLog b/src/ChangeLog
index b518f478acb58a147d4dce45352c1975a4c697b2..9f667c992656dc861c8e2e50c914f49fe97569d4 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2001-05-16  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * lyxrc.C (read): print error about invalid key sequence only when
+       debugging (because not all latinX keysyms are known to some X
+       servers)
+
+       * kbsequence.C (getiso): add a few std:: qualifiers
+       (getiso): comment out extra return statement.
+
 2001-05-11  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
        * BufferView_pimpl.C (Dispatch): comment out the old "default" key

diff --git a/src/kbsequence.C b/src/kbsequence.C
index 459185aacc113812b5a5f10579802e92b80e320d..29b7d453b0ffdb1d62206291f25ea0a94fe91b08 100644 (file)
--- a/src/kbsequence.C
+++ b/src/kbsequence.C
@@ -262,8 +262,8 @@ char kb_sequence::getiso() const
 {
        unsigned int const c = getsym();
 
-       lyxerr << "Raw keysym: " << hex << c << dec << endl;
-       lyxerr << "byte 3: " << hex << (c & 0x0000FF00) << dec << endl;
+       lyxerr << "Raw keysym: " << std::hex << c << std::dec << endl;
+       lyxerr << "byte 3: " << std::hex << (c & 0x0000FF00) << std::dec << endl;
        
        switch (c & 0x0000FF00) {
                // latin 1 byte 3 = 0
@@ -285,7 +285,8 @@ char kb_sequence::getiso() const
        }
 
        // not a latin char we know of
-       return '\0';
+       // Yes but this is already handled above (JMarc)
+       //return '\0';
 }
 
 

diff --git a/src/lyxrc.C b/src/lyxrc.C
index 7afa7e0b3ac8ef570349534269b35e915b6a2642..ea6e840112e46613a00f7e276ea3b6bc23fef11b 100644 (file)
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -714,8 +714,10 @@ int LyXRC::read(string const & filename)
                                               << action << '\'' << endl;
                                }
                                res = toplevel_keymap->bind(seq, action);
-                               if (res != 0) {
+                               if (res != 0
+                                   && lyxerr.debugging(Debug::KBMAP)) {
                                        lexrc.printError(
+                                               "RC_BIND: "
                                                "Invalid key sequence `"
                                                + seq + '\''); 
                                }