From 74952b3ab2c12772e60402e8e5d59bcef64eaf89 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Tue, 25 Jul 2000 12:44:07 +0000 Subject: [PATCH] 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 --- ChangeLog | 3 +++ src/lyxrc.C | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1b3c2c08bc..110525dfa1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2000-07-25 Jean-Marc Lasgouttes + * 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 d3132a33ca..145899be65 100644 --- 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; } -- 2.39.5