Correct Right Arrow key processing in Modules list

[lyx.git] / src / LyXRC.cpp

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index 3b0add1ea662cdec78cb8a8c6be049466a2abea9..328e6832a074434f34148de294712c65ffd4b0ac 100644 (file)
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -643,13 +643,13 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
                                lexrc.printError("Missing color tag.");
                                break;
                        }
-                       string lyx_name = lexrc.getString();
+                       string const lyx_name = lexrc.getString();
 
                        if (!lexrc.next()) {
                                lexrc.printError("Missing color name for color: `$$Token'");
                                break;
                        }
-                       string x11_name = lexrc.getString();
+                       string const x11_name = lexrc.getString();
 
                        ColorCode const col =
                                lcolor.getFromLyXName(lyx_name);
@@ -660,6 +660,7 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
 
                        if (!lcolor.setColor(col, x11_name))
                                LYXERR0("Bad lyxrc set_color for " << lyx_name);
+                       LYXERR(Debug::LYXRC, "Set " << lyx_name << "(" << col << ") to " << x11_name);
                        break;
                }
 
@@ -669,9 +670,13 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
                        break;
 
                case RC_SERVERPIPE:
-                       if (lexrc.next())
-                               lyxpipes = subst(os::internal_path(lexrc.getString()), "$$User",
-                                       package().user_support().absFileName());
+                       if (lexrc.next()) {
+                               string userdir = package().user_support().absFileName();
+                               if (userdir.back() == '/')
+                                 userdir.pop_back();
+                               lyxpipes = subst(os::internal_path(lexrc.getString()), "$$UserDir",
+                                       userdir);
+                       }
                        break;
 
                case RC_CT_ADDITIONS_UNDERLINED:
@@ -1932,9 +1937,9 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
        case RC_SET_COLOR:
                for (int i = 0; i < Color_ignore; ++i) {
                        ColorCode lc = static_cast<ColorCode>(i);
-                       string const col = lcolor.getX11Name(lc);
+                       string const col = lcolor.getX11HexName(lc);
                        if (ignore_system_lyxrc
-                           || col != system_lcolor.getX11Name(lc)) {
+                           || col != system_lcolor.getX11HexName(lc)) {
                                os << "\\set_color \""
                                   << lcolor.getLyXName(lc) << "\" \""
                                   << col << "\"\n";