More ascii-export fixes and when making copy of single tabular cells now the

[lyx.git] / src / lyxrc.C

diff --git a/src/lyxrc.C b/src/lyxrc.C
index ed126b1547b19c47191526a3097d33db3d36f54f..857c2d96f0ad7c4a75b050978da802a236109e21 100644 (file)
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -23,10 +23,8 @@
 #include "lyxrc.h"
 #include "kbmap.h"
 #include "LyXAction.h"
-#include "lyxserver.h"
 #include "lyx_main.h"
 #include "intl.h"
-#include "tex-strings.h"
 #include "support/path.h"
 #include "support/filetools.h"
 #include "lyxtext.h"
@@ -243,7 +241,6 @@ void LyXRC::setDefaults() {
        language_use_babel = true;
        language_package = "\\usepackage{babel}";
        language_command_begin = "\\selectlanguage{$$lang}";
-       language_command_end = "\\selectlanguage{$$lang}";
        language_command_local = "\\foreignlanguage{$$lang}{";
        default_language = "english";
        //
@@ -739,8 +736,8 @@ int LyXRC::read(string const & filename)
                                               << cmd << "' Action `"
                                               << action << '\'' << endl;
                                }
-                               res = toplevel_keymap->bind(seq, action);
-                               if (res != 0
+                               res = toplevel_keymap->bind(seq, kb_action(action));
+                               if (res != string::npos
                                    && lyxerr.debugging(Debug::LYXRC)) {
                                        lexrc.printError(
                                                "RC_BIND: "
@@ -1650,6 +1647,10 @@ void LyXRC::set_font_norm_type()
                font_norm_type = ISO_10646_1;
        else if (font_norm == "iso8859-1")
                font_norm_type = ISO_8859_1;
+       else if (font_norm == "iso8859-3")
+               font_norm_type = ISO_8859_3;
+       else if (font_norm == "iso8859-4")
+               font_norm_type = ISO_8859_4;
        else if (font_norm == "iso8859-6.8x")
                font_norm_type = ISO_8859_6_8;
        else if (font_norm == "iso8859-9")