From b8192fd0155066ebe605345de082a9d6c9f09e68 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Fri, 17 Apr 2015 17:01:15 +0100
Subject: [PATCH 1/2] first attempt at fixing dead keys, it cant be this easy
 can it?

---
 src/static/js/ace2_inner.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js
index 1120b2c1..bcb30623 100644
--- a/src/static/js/ace2_inner.js
+++ b/src/static/js/ace2_inner.js
@@ -3680,6 +3680,11 @@ function Ace2Inner(){
           stopped = true;
         }
       }
+      else if (evt.key === "Dead"){
+        // If it's a dead key we don't want to do any Etherpad behavior.
+        stopped = true;
+        return true;
+      }
       else if (type == "keydown")
       {
         outsideKeyDown(evt);

From 975bd99064ff2669aa4b64c7bb06754418158e70 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Thu, 7 May 2015 15:55:52 +0000
Subject: [PATCH 2/2] support for french stuff

---
 src/static/js/ace2_inner.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js
index bcb30623..e2e1128c 100644
--- a/src/static/js/ace2_inner.js
+++ b/src/static/js/ace2_inner.js
@@ -3889,7 +3889,7 @@ function Ace2Inner(){
           toggleAttributeOnSelection('underline');
           specialHandled = true;
         }
-       if ((!specialHandled) && isTypeForCmdKey && String.fromCharCode(which).toLowerCase() == "5" && (evt.metaKey || evt.ctrlKey))
+        if ((!specialHandled) && isTypeForCmdKey && String.fromCharCode(which).toLowerCase() == "5" && (evt.metaKey || evt.ctrlKey) && evt.altKey !== true)
         {
           // cmd-5 (strikethrough)
           fastIncorp(13);