anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-20 23:00:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* src/intl.C (InitKeyMapper): reset kbmap file names if the files

Browse Source 
could not be read (bug 2604).



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_4_X@13970 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2006-05-31 10:32:26 +00:00
parent a0d31cd2c1
commit 86a77679c8
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ChangeLog
View File

@ -1,7 +1,12 @@
2006-05-30 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* intl.C (InitKeyMapper): reset kbmap file names if the files
could not be read (bug 2604).
2006-05-29 Jürgen Spitzmüller <j.spitzmueller@gmx.de> 2006-05-29 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
* LaTeX.C (run): rerun latex im idx file is empty (needed by memoir) * LaTeX.C (run): rerun latex if idx file is empty (needed by memoir)
        fix typo in comment (bug 2623). fix typo in comment (bug 2623).
* LaTeXFeatures.C (getPackages): whitespace. * LaTeXFeatures.C (getPackages): whitespace.

10
src/intl.C
View File

@ -77,6 +77,12 @@ void Intl::InitKeyMapper(bool on)
{ {
lyxerr[Debug::INIT] << "Initializing key mappings..." << endl; lyxerr[Debug::INIT] << "Initializing key mappings..." << endl;
if (trans.SetPrimary(prim_lang) == -1)
prim_lang.erase();
if (trans.SetSecondary(sec_lang) == -1)
sec_lang.erase();
trans.setCharset(lyxrc.font_norm);
if (prim_lang.empty() && sec_lang.empty()) if (prim_lang.empty() && sec_lang.empty())
keymapon = false; keymapon = false;
else else
@ -86,8 +92,4 @@ void Intl::InitKeyMapper(bool on)
if (keymapon) if (keymapon)
KeyMapPrim(); KeyMapPrim();
trans.SetPrimary(prim_lang);
trans.SetSecondary(sec_lang);
trans.setCharset(lyxrc.font_norm);
} }

5
status.14x
View File

@ -113,7 +113,10 @@ What's new
- Fix display of horizontal fill which appears at the end of a line - Fix display of horizontal fill which appears at the end of a line
(bug 2508). (bug 2508).
- Fix crash when changing document class while the cursor is inside a table - Fix crash when changing document class while the cursor is inside a
table.
- Fix crash when there is a syntax error in a keyboard map file (bug 2604).
* Configuration/Installation: * Configuration/Installation: