From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Thu, 18 Jun 2009 15:04:55 +0000 (+0000)
Subject: fix reading of obsolete prefs (the argument never got discarded)
X-Git-Tag: 2.0.0~6276
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=9cd55dbe5cfb6ed32f64cc1a3d2136d5456ea558;p=features.git

fix reading of obsolete prefs (the argument never got discarded)

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

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index 59ebff50cf..81b3fd6d28 100644
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -710,11 +710,6 @@ int LyXRC::read(Lexer & lexrc)
 			}
 			break;
 
-		case RC_USETEMPDIR:
-			if (lexrc.next())
-				LYXERR0("Ignoring obsolete use_tempdir flag.");
-			break;
-
 		case RC_USELASTFILEPOS:
 			lexrc >> use_lastfilepos;
 			break;
@@ -873,9 +868,6 @@ int LyXRC::read(Lexer & lexrc)
 			lexrc >> dialogs_iconify_with_main;
 			break;
 
-		case RC_PLAINTEXT_ROFF_COMMAND: 
-			(void) lexrc.getString(); // Obsoleted in 2.0
-			break;
 		case RC_PLAINTEXT_LINELEN:
 			lexrc >> plaintext_linelen;
 			break;
@@ -883,15 +875,9 @@ int LyXRC::read(Lexer & lexrc)
 		case RC_ACCEPT_COMPOUND:
 			lexrc >> spellchecker_accept_compound;
 			break;
-		case RC_USE_INP_ENC:
-			(void) lexrc.getString(); // Obsoleted in 2.0
-			break;
 		case RC_USE_ALT_LANG:
 			lexrc >> spellchecker_use_alt_lang;
 			break;
-		case RC_USE_PERS_DICT:
-			(void) lexrc.getString(); // Obsoleted in 2.0
-			break;
 		case RC_USE_TOOLTIP:
 			lexrc >> use_tooltip;
 			break;
@@ -904,9 +890,6 @@ int LyXRC::read(Lexer & lexrc)
 		case RC_ALT_LANG:
 			lexrc >> spellchecker_alt_lang;
 			break;
-		case RC_PERS_DICT:
-			(void) lexrc.getString(); // Obsoleted in 2.0
-			break;
 		case RC_ESC_CHARS:
 			lexrc >> spellchecker_esc_chars;
 			break;
@@ -1132,10 +1115,18 @@ int LyXRC::read(Lexer & lexrc)
 			lexrc >> open_buffers_in_tabs;
 			break;
 
+		// Obsoteted in 1.4.0
+		case RC_USETEMPDIR:
 		// Obsoleted in 2.0
 		case RC_SPELL_COMMAND:
+		case RC_PERS_DICT:
+		case RC_PLAINTEXT_ROFF_COMMAND: 
+		case RC_USE_INP_ENC:
+		case RC_USE_PERS_DICT:
 		case RC_USE_SPELL_LIB:
-			(void) lexrc.getString();
+			LYXERR(Debug::LYXRC, "Skipping obsolete tag `" 
+			       << lexrc.getString() << "'.");
+			lexrc.next(true);
 			break;
 
 		case RC_LAST: