Fix a crash when using iso10646-1 encoding

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 605af3f4037e0588d01b744772ec1d160a1ae8da..55eb43b94a2318f05559dd95657109162913edbf 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-20  Dekel Tsur  <dekelts@tau.ac.il>
+
+       * language.C (read): Use iso8859-1 encoding in latex_lang
+       (this prevents LyX from crashing when using iso10646-1 encoding).
+
 2002-07-19  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
        * text2.C (toggleInset): if cursor is inside an inset, close the

diff --git a/src/language.C b/src/language.C
index bb5d5f1d67d7e22ab49b0e4fe51609ce9d4d5524..017049fe237a4fea7afee2d85ad43ac20c573c28 100644 (file)
--- a/src/language.C
+++ b/src/language.C
@@ -37,6 +37,11 @@ Language const * inherit_language = &inherit_lang;
 
 void Languages::setDefaults()
 {
+       // We need to set the encoding of latex_lang
+       latex_lang = Language("latex", "latex", "Latex", false,
+                             encodings.getEncoding("iso8859-1"),
+                             "latex", "");
+
        languagelist["english"] = Language("english", "english", N_("English"),
                                           false,
                                           encodings.getEncoding("iso8859-1"),
@@ -46,6 +51,11 @@ void Languages::setDefaults()
 
 void Languages::read(string const & filename)
 {
+       // We need to set the encoding of latex_lang
+       latex_lang = Language("latex", "latex", "Latex", false,
+                             encodings.getEncoding("iso8859-1"),
+                             "latex", "");
+
        LyXLex lex(0, 0);
        lex.setFile(filename);
        while (lex.isOK()) {

diff --git a/src/stamp-h.in b/src/stamp-h.in
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..9788f70238c91894045d22366fa941580826c3c1 100644 (file)
--- a/src/stamp-h.in
+++ b/src/stamp-h.in
@@ -0,0 +1 @@
+timestamp