From 9b2cbdcdaac203999484ef90225f6cba5e8052db Mon Sep 17 00:00:00 2001
From: Hugo Herbelin
Date: Sat, 27 Apr 2019 22:19:15 +0200
Subject: CoqiDE: Load coqide.keys after coqiderc (addressing part of #9899).

This avoids the modifiers keys to overwrite changes made in
coqide.keys.
---
 ide/preferences.ml | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/ide/preferences.ml b/ide/preferences.ml
index 47cd4c58b6..57bc0f583f 100644
--- a/ide/preferences.ml
+++ b/ide/preferences.ml
@@ -658,15 +658,18 @@ let save_pref () =
   Config_lexer.print_file pref_file prefs
 
 let load_pref () =
+  (* Load main preference file *)
+  let () =
+    let m = Config_lexer.load_file loaded_pref_file in
+    let iter name v =
+      if Util.String.Map.mem name !preferences then
+        try (Util.String.Map.find name !preferences).set v with _ -> ()
+      else unknown_preferences := Util.String.Map.add name v !unknown_preferences
+    in
+    Util.String.Map.iter iter m in
+  (* Load file for bindings *)
   let () = try GtkData.AccelMap.load loaded_accel_file with _ -> () in
-
-  let m = Config_lexer.load_file loaded_pref_file in
-  let iter name v =
-    if Util.String.Map.mem name !preferences then
-      try (Util.String.Map.find name !preferences).set v with _ -> ()
-    else unknown_preferences := Util.String.Map.add name v !unknown_preferences
-  in
-  Util.String.Map.iter iter m
+  ()
 
 let pstring name p = string ~f:p#set name p#get
 let pbool name p = bool ~f:p#set name p#get
-- 
cgit v1.2.3