anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-26 19:25:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug #6119: Keyboard map still shows up after deleting.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30850 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2009-08-03 19:54:32 +00:00
parent 898c621b84
commit 997d8ba557
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/LyXRC.cpp
View File

@ -450,10 +450,8 @@ int LyXRC::read(Lexer & lexrc)
case RC_KBMAP_PRIMARY: case RC_KBMAP_PRIMARY:
if (lexrc.next()) { if (lexrc.next()) {
string const kmap(os::internal_path(lexrc.getString())); string const kmap(os::internal_path(lexrc.getString()));
if (kmap.empty()) { if (!libFileSearch("kbd", kmap, "kmap").empty()
// nothing || kmap.empty()) {
} else if (!libFileSearch("kbd", kmap,
"kmap").empty()) {
primary_kbmap = kmap; primary_kbmap = kmap;
} else { } else {
lexrc.printError("LyX: Keymap `$$Token' not found"); lexrc.printError("LyX: Keymap `$$Token' not found");
@ -464,10 +462,8 @@ int LyXRC::read(Lexer & lexrc)
case RC_KBMAP_SECONDARY: case RC_KBMAP_SECONDARY:
if (lexrc.next()) { if (lexrc.next()) {
string const kmap(os::internal_path(lexrc.getString())); string const kmap(os::internal_path(lexrc.getString()));
if (kmap.empty()) { if (!libFileSearch("kbd", kmap, "kmap").empty()
// nothing || kmap.empty()) {
} else if (!libFileSearch("kbd", kmap,
"kmap").empty()) {
secondary_kbmap = kmap; secondary_kbmap = kmap;
} else { } else {
lexrc.printError("LyX: Keymap `$$Token' not found"); lexrc.printError("LyX: Keymap `$$Token' not found");