aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHugo Herbelin2019-04-27 12:15:59 +0200
committerHugo Herbelin2019-04-30 12:50:47 +0200
commita63ac0351d6feb3f3242649faccf88da6a34d5eb (patch)
treea2db422af2e45f7a820de40d8224776103205d97
parent823bde2eaffbacdb7a3a08c9d7274cd84dc5bef5 (diff)
Fix a nanoPG bug: was accepting unexpectedly extra modifier keys pressed.
For instance, Ctrl-Meta-e was behaving like Ctrl-e.
-rw-r--r--ide/nanoPG.ml5
1 files changed, 4 insertions, 1 deletions
diff --git a/ide/nanoPG.ml b/ide/nanoPG.ml
index d85d87142c..de386e4ccf 100644
--- a/ide/nanoPG.ml
+++ b/ide/nanoPG.ml
@@ -67,7 +67,10 @@ type 'c entry = {
let mC = [`CONTROL]
let mM = [`MOD1]
-let mod_of t x = List.for_all (fun m -> List.mem m (GdkEvent.Key.state t)) x
+let mod_of t x =
+ let y = GdkEvent.Key.state t in
+ List.for_all (fun m -> List.mem m y) x &&
+ List.for_all (fun m -> List.mem m x) y
let pr_keymod l =
if l = mC then "C-"