From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Tue, 27 Jun 2000 15:46:07 +0000 (+0000)
Subject: Make sure primary|secondary_keymap are correct.
X-Git-Tag: 1.6.10~22150
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=87b286941999aca29aab69e70eb8b6b67615b681;p=features.git

Make sure primary|secondary_keymap are correct.


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

diff --git a/ChangeLog b/ChangeLog
index 2cbca03ac2..3015d594dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-06-27  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
+	* src/lyxrc.C (read): make sure the .kmap files exist when a keymap
+	is specified (adapted from a patch from edscott <edscott@imp.mx>).
+
 	* Makefile.am (bindist): new target.
 
 	* INSTALL: add instructions for doing a binary distribution.
diff --git a/src/lyxrc.C b/src/lyxrc.C
index fdef9a3dcb..2758bba5ae 100644
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -478,13 +478,21 @@ int LyXRC::read(string const & filename)
 			break;
 			
 		case RC_KBMAP_PRIMARY:
-			if (lexrc.next())
-				primary_kbmap = lexrc.GetString();
+			if (lexrc.next()) 
+				if (!LibFileSearch("kbd", lexrc.GetString(), 
+						   "kmap").empty()) 
+					primary_kbmap = lexrc.GetString();
+				else 
+					lexrc.printError("LyX: Keymap `$$Token' not found");
 			break;
 			
 		case RC_KBMAP_SECONDARY:
-			if (lexrc.next())
-				secondary_kbmap = lexrc.GetString();
+			if (lexrc.next()) 
+				if (!LibFileSearch("kbd", lexrc.GetString(), 
+						   "kmap").empty()) 
+					secondary_kbmap = lexrc.GetString();
+				else 
+					lexrc.printError("LyX: Keymap `$$Token' not found");
 			break;
 			
 		case RC_FONT_ENCODING: