Fix small bug in reading \set_color in lyxrc

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

diff --git a/ChangeLog b/ChangeLog
index 1b3c2c08bcfba79ac0da0319cca43ead7137ba24..110525dfa1cec5489e703d8f2e85b02f776c4de3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-07-25  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
+       * src/lyxrc.C (read): do not use LyXLex::lex() to parse set_color
+       arguments. 
+
        * lib/ui/default.ui: fix a couple of typos.
 
        * config/gnome/gtk.m4: added (and added to the list of files in 

diff --git a/src/lyxrc.C b/src/lyxrc.C
index d3132a33ca93c035e3ef2737c9cd4853a2a4acb0..145899be6549f62f6e85d4cb9af911dd44f5d1d2 100644 (file)
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -871,17 +871,17 @@ int LyXRC::read(string const & filename)
                {
                        string lyx_name, x11_name;
 
-                       if (lexrc.lex() == LyXLex::LEX_DATA)  {
+                       if (lexrc.next())  {
                                lyx_name = lexrc.GetString();
                        } else {
-                               lexrc.printError("Bad color tag: `$$Token'");
+                               lexrc.printError("Missing color tag.");
                                break;
                        }
                        
-                       if (lexrc.lex() == LyXLex::LEX_DATA) {
+                       if (lexrc.next()) {
                                x11_name = lexrc.GetString();
                        } else {
-                               lexrc.printError("Bad color name: `$$Token'");
+                               lexrc.printError("Missing color name for color : `$$Token'");
                                break;
                        }