Squash unnecessary warning message.

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 6214a42fec71cbfcff76e3c70d91a3168a253013..ac5bcebc5f4e27c605717e8438944908ba96ca84 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-08  Angus Leeming  <leeming@lyx.org>
+
+       * lyxrc.C (read): don't try to set the color of none, inherit, ignore
+       thereby squashing an unnecessary warning.
+
 2004-04-01  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
 
        * LaTeXFeatures.[Ch]: change buffer_ to a pointer and add accessor

diff --git a/src/lyxrc.C b/src/lyxrc.C
index 42277368101aa256566cd01a33452b301e301bfe..9481951d056352962e53e1dff86491c599e7d143 100644 (file)
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -786,7 +786,13 @@ int LyXRC::read(LyXLex & lexrc)
                                break;
                        }
 
-                       LColor::color col = lcolor.getFromLyXName(lyx_name);
+                       LColor::color const col = 
+                               lcolor.getFromLyXName(lyx_name);
+                       if (col == LColor::none || 
+                           col == LColor::inherit ||
+                           col == LColor::ignore)
+                               break;
+
                        if (!lcolor.setColor(col, x11_name)) {
                                lyxerr << "Bad lyxrc set_color for "
                                        << lyx_name << endl;