X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fmatita%2FmatitaGui.ml;h=ed739eefbebb8c9be4a9e5ab95f919166625a722;hb=f7678e750c4a8551475d4538b824e328f523c564;hp=57076910226043a5e7fe876e512c8394f9362257;hpb=5b306342bf9befa57abd870527d6bd92b0a5ba50;p=helm.git

diff --git a/helm/matita/matitaGui.ml b/helm/matita/matitaGui.ml
index 570769102..ed739eefb 100644
--- a/helm/matita/matitaGui.ml
+++ b/helm/matita/matitaGui.ml
@@ -23,6 +23,8 @@
  * http://helm.cs.unibo.it/
  *)
 
+(* $Id$ *)
+
 open Printf
 
 open MatitaGeneratedGui
@@ -73,11 +75,17 @@ let ask_and_save_moo_if_needed parent fname lexicon_status grafite_status =
   let baseuri = DependenciesParser.baseuri_of_script ~include_paths:[] fname in
   let moo_fname = LibraryMisc.obj_file_of_baseuri ~basedir ~baseuri in
   let save () =
-    let metadata_fname= LibraryMisc.metadata_file_of_baseuri ~basedir ~baseuri in
-    GrafiteMarshal.save_moo moo_fname
-     grafite_status.GrafiteTypes.moo_content_rev;
-    LibraryNoDb.save_metadata metadata_fname
-     lexicon_status.LexiconEngine.metadata
+    let metadata_fname =
+     LibraryMisc.metadata_file_of_baseuri ~basedir ~baseuri in
+    let lexicon_fname =
+     LibraryMisc.lexicon_file_of_baseuri ~basedir ~baseuri
+    in
+     GrafiteMarshal.save_moo moo_fname
+      grafite_status.GrafiteTypes.moo_content_rev;
+     LibraryNoDb.save_metadata metadata_fname
+      lexicon_status.LexiconEngine.metadata;
+     LexiconMarshal.save_lexicon lexicon_fname
+      lexicon_status.LexiconEngine.lexicon_content_rev
   in
   if (MatitaScript.current ())#eos &&
      grafite_status.GrafiteTypes.proof_status = GrafiteTypes.No_proof
@@ -599,7 +607,9 @@ class gui () =
         (* log *)
       HLog.set_log_callback self#console#log_callback;
       GtkSignal.user_handler :=
-        (fun exn ->
+        (function 
+        | MatitaScript.ActionCancelled -> () 
+        | exn ->
           if not (Helm_registry.get_bool "matita.debug") then
            let floc, msg = MatitaExcPp.to_string exn in
             begin
@@ -717,12 +727,6 @@ class gui () =
       let top = locker (keep_focus top) in
       let bottom = locker (keep_focus bottom) in
       let jump = locker (keep_focus jump) in
-      let connect_key sym f =
-        connect_key main#mainWinEventBox#event
-          ~modifiers:[`CONTROL] ~stop:true sym f;
-        connect_key self#sourceView#event
-          ~modifiers:[`CONTROL] ~stop:true sym f
-      in
         (* quit *)
       self#setQuitCallback (fun () -> 
         let lexicon_status = (MatitaScript.current ())#lexicon_status in