Fix the language problem in new lyxtexts, without causing

Helge's problem of not being able to change font on the fly.

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 6e2e61326041dab77c39cae320bb6e4418e43085..ed6cd405b0c1a2650610e275ce401b398a4d1c13 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-19  Martin Vermeer  <martin.vermeer@hut.fi>
+
+       * text3.C (dispatch): fix, finally fix, the language problem in
+       new lyxtexts, without disabling on-the-fly font changes (Helge's
+       bug report)
+
 2005-04-19  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
        * text3.C (dispatch): set cursor on double/triple click events

diff --git a/src/text3.C b/src/text3.C
index a770c0fb505b13817e15d712d16213135b9941c6..b725609dfca50d6b7ccc2bfe4e39bd8ae74e1318 100644 (file)
--- a/src/text3.C
+++ b/src/text3.C
@@ -1115,7 +1115,10 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
                LyXFont const old_font = real_current_font;
                
                // Prevents language turds in new lyxtexts under non-english
-               setCurrentFont(cur);
+               BufferParams const & bufparams = cur.buffer().params();
+               Language const * lang = cur.paragraph().getParLanguage(bufparams);
+               current_font.setLanguage(lang);
+               real_current_font.setLanguage(lang);
 
                string::const_iterator cit = cmd.argument.begin();
                string::const_iterator end = cmd.argument.end();