From 84480c05b2b8eb77b453d3d681541d0c0f3331a2 Mon Sep 17 00:00:00 2001
From: Angus Leeming <leeming@lyx.org>
Date: Wed, 1 May 2002 14:43:38 +0000
Subject: [PATCH] Fix bug that I triggered with the sorting of the language
 names. Note that this bug was always there, I just had the honour of
 triggering it!

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4107 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/controllers/ChangeLog          |  8 ++++++++
 src/frontends/controllers/ControlCharacter.C |  6 +++---
 src/frontends/controllers/frnt_lang.C        | 10 +++++++---
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog
index e1d1a4ccec..ebad706c8f 100644
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -1,3 +1,11 @@
+2002-05-01  Angus Leeming  <a.leeming@ic.ac.uk>
+
+	* ControlCharacter.C: use "ignore" and "reset" as the identifiers, not
+	"No change" and "Reset".
+
+	* frnt_lang.C: ditto. Further, do not sort thes two entries. Ie, leave
+	them at the front of the list.
+
 2002-05-01  Angus Leeming  <a.leeming@ic.ac.uk>
 
 	* ControlGraphics.C: add some comments to the char * arrays.
diff --git a/src/frontends/controllers/ControlCharacter.C b/src/frontends/controllers/ControlCharacter.C
index b291a5bad9..a00011273a 100644
--- a/src/frontends/controllers/ControlCharacter.C
+++ b/src/frontends/controllers/ControlCharacter.C
@@ -220,16 +220,16 @@ string ControlCharacter::getLanguage() const
 {
 	if (font_.get() && font_->language())
 		return font_->language()->lang();
-	return "No change";
+	return "ignore";
 }
 
 
 void ControlCharacter::setLanguage(string const & val)
 {
-	if (val == "No change")
+	if (val == "ignore")
 		font_->setLanguage(ignore_language);
 
-	else if (val == "Reset")
+	else if (val == "reset")
 		font_->setLanguage(lv_.buffer()->params.language);
 
 	else
diff --git a/src/frontends/controllers/frnt_lang.C b/src/frontends/controllers/frnt_lang.C
index abae87bae2..3f471f1cc0 100644
--- a/src/frontends/controllers/frnt_lang.C
+++ b/src/frontends/controllers/frnt_lang.C
@@ -42,8 +42,8 @@ vector<LanguagePair> const getLanguageData(bool character_dlg)
 	vector<LanguagePair> langs(size);
 
 	if (character_dlg) {
-		langs[0].first = N_("No change"); langs[0].second = "No change";
-		langs[1].first = N_("Reset");     langs[1].second = "Reset";
+		langs[0].first = N_("No change"); langs[0].second = "ignore";
+		langs[1].first = N_("Reset");     langs[1].second = "reset";
 	}
 
 	vector<string>::size_type i = character_dlg ? 2 : 0;
@@ -54,7 +54,11 @@ vector<LanguagePair> const getLanguageData(bool character_dlg)
 		++i;
 	}
 
-	std::sort(langs.begin(), langs.end(), Sorter());
+	// Don't sort "ignore" and "reset"
+	vector<LanguagePair>::iterator begin = character_dlg ?
+		langs.begin() + 2 : langs.begin();
+
+	std::sort(begin, langs.end(), Sorter());
 
 	return langs;
 }
-- 
2.39.2