n Mon, 26 Jun 2000, Jean-Marc Lasgouttes wrote:

> 
> Just create a patch with "diff -u". Having a ChangeLog entry is nice
> too.

I am appending two tiny patches, one to avoid the crash described previously
and the second for when including files by input. This could be the ChangeLog:

2000-06-26 edscott  <[EMAIL PROTECTED]>

        * lyxrc.C (LyXRC::read): Set variable use_keymap to false if the file
               specified in lyxrc file cannot be read.

2000-06-26 edscott  <[EMAIL PROTECTED]>

        * insets/insetinclude.C (include_cb): Set browse filter to *.lyx.



I am not sure whether the browse filter is a bug, but I can not understand why
the default option will produce LaTex errors without manually modifying the
.tex files (bleah).


---

Edscott 
--- lyxrc.old.C Mon Jun 26 15:29:26 2000
+++ lyxrc.C     Mon Jun 26 15:35:09 2000
@@ -469,8 +469,19 @@
                        break;
                        
                case RC_KBMAP_PRIMARY:
-                       if (lexrc.next())
+                       if (lexrc.next()) {
                                primary_kbmap = lexrc.GetString();
+                               string path = system_lyxdir + "kbd/" + primary_kbmap + 
+".kmap";
+                               ifstream check(path.c_str());
+                               if (!check) {
+                                       path = user_lyxdir + "kbd/" + primary_kbmap + 
+".kmap";
+                                       ifstream check(path.c_str());
+                                       if (!check) {
+                                               lyxerr << "LyX: Keymap " << 
+primary_kbmap << " not found" << endl;
+                                               use_kbmap=0;
+                                       } else check.close();
+                               } else check.close();
+                       } else use_kbmap=0;
                        break;
                        
                case RC_KBMAP_SECONDARY:
--- insets/insetinclude.old.C   Mon Jun 26 15:50:35 2000
+++ insets/insetinclude.C       Mon Jun 26 15:50:39 2000
@@ -105,7 +105,7 @@
                 string ext;
     
                if (fl_get_button(form->flag2)) // Use Input Button
-                       ext = "*.tex";
+                       ext = "*.lyx";
                else if (fl_get_button(form->flag4)) // Verbatim all files
                        ext = "*";
                 else

Reply via email to