From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Sun, 16 Nov 2008 13:57:21 +0000 (+0000)
Subject: cosmetics
X-Git-Tag: 2.0.0~7721
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=970911abe6ae1a5b8310e4000d838875aba8bd07;p=features.git

cosmetics

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

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 8d0fa0113e..4c170dfc5b 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -8,11 +8,10 @@ been applied because of incomplete testing.
 Interface changes
 -----------------
 
-Some lyxrc variables have been removed:
-
-- \plaintext_roff_command was not used anymore, it is now removed.
-
+The following variables are obsoleted in 2.0
 
+- \plaintext_roff_command (was not used anymore)
+- \spell_command and \use_spell_lib (ispell support has been removed)
 
 Known issues in version 2.0.0
 -----------------------------
diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index ebbff6a463..b8becc0689 100644
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -382,15 +382,13 @@ int LyXRC::read(Lexer & lexrc)
 
 		int le = lexrc.lex();
 		switch (le) {
-			case Lexer::LEX_UNDEF:
-				// dro[ obsolete tag
-				if (lexrc.getString() != "\\plaintest_roff_command")
-					lexrc.printError("Unknown tag `$$Token'");
-				continue;
-			case Lexer::LEX_FEOF:
-				continue;
-			default:
-				break;
+		case Lexer::LEX_UNDEF:
+			lexrc.printError("Unknown tag `$$Token'");
+			continue;
+		case Lexer::LEX_FEOF:
+			continue;
+		default:
+			break;
 		}
 		switch (static_cast<LyXRCTags>(le)) {
 		case RC_INPUT: // Include file
@@ -828,7 +826,7 @@ int LyXRC::read(Lexer & lexrc)
 			break;
 
 		case RC_PLAINTEXT_ROFF_COMMAND: 
-			(void) lexrc.getString(); // Obsoleted in 1.7
+			(void) lexrc.getString(); // Obsoleted in 2.0
 			break;
 		case RC_PLAINTEXT_LINELEN:
 			lexrc >> plaintext_linelen;
@@ -1077,11 +1075,8 @@ int LyXRC::read(Lexer & lexrc)
 			lexrc >> open_buffers_in_tabs;
 			break;
 
-		// Obsoleted in 1.7
+		// Obsoleted in 2.0
 		case RC_SPELL_COMMAND:
-			(void) lexrc.getString();
-			break;
-		// Obsoleted in 1.7
 		case RC_USE_SPELL_LIB:
 			(void) lexrc.getString();
 			break;
@@ -2048,7 +2043,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 		if (tag != RC_LAST)
 			break;
 		// Ignore it
-	case RC_PLAINTEXT_ROFF_COMMAND: // Obsoleted in 1.7
+	case RC_PLAINTEXT_ROFF_COMMAND: // Obsoleted in 2.0
 		if (tag != RC_LAST)
 			break;
 	case RC_PLAINTEXT_LINELEN:
@@ -2082,9 +2077,10 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 		   << "# SPELLCHECKER SECTION ##############################\n"
 		   << "#\n\n";
 	case RC_SPELL_COMMAND:
-		// Obsoleted in 1.7
 	case RC_USE_SPELL_LIB:
-		// Obsoleted in 1.7
+		// Obsoleted in 2.0
+		if (tag != RC_LAST)
+			break;
 	case RC_ACCEPT_COMPOUND:
 		if (ignore_system_lyxrc ||
 		    spellchecker_accept_compound != system_lyxrc.spellchecker_accept_compound) {