write \mathrm{x}\mathrm{y} as \mathrm{xy} again

[lyx.git] / src / kbsequence.C

diff --git a/src/kbsequence.C b/src/kbsequence.C
index ce5b2127feb2c7f3deb95ae44bac126e413c4524..89ce116ad604053386dfd154d62fcad6a8e46344 100644 (file)
--- a/src/kbsequence.C
+++ b/src/kbsequence.C
@@ -4,12 +4,12 @@
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
 #include <config.h>
-#include <cstring>
+//#include <cstring>
 #include <X11/Xlib.h>
 
 #include "gettext.h"
@@ -93,7 +93,7 @@ int kb_sequence::addkey(unsigned int key,
                 Prefixes are S-, C-, M- for shift, control, meta
 \* ---F------------------------------------------------------------------- */
 
-int kb_sequence::parse(string const & s)
+string::size_type kb_sequence::parse(string const & s)
 {
        if (s.empty()) return 1;
 
@@ -263,8 +263,11 @@ char kb_sequence::getiso() const
 {
        unsigned int const c = getsym();
 
-       lyxerr << "Raw keysym: " << std::hex << c << std::dec << endl;
-       lyxerr << "byte 3: " << std::hex << (c & 0x0000FF00) << std::dec << endl;
+       lyxerr[Debug::KBMAP] << "Raw keysym: "
+                            << std::hex << c << std::dec << endl;
+       lyxerr[Debug::KBMAP] << "byte 3: "
+                            << std::hex << (c & 0x0000FF00) << std::dec
+                            << endl;
        
        switch (c & 0x0000FF00) {
                // latin 1 byte 3 = 0