From 63092d12c0f1a1460189cbaacdb1d9f27f935e0e Mon Sep 17 00:00:00 2001
From: Frank LENORMAND <lenormf@gmail.com>
Date: Sun, 1 Dec 2019 21:55:55 +0100
Subject: [PATCH 1/2] src: Fix the build on Mac

When compiled on Mac with `clang`, the following error occurs at
compile-time:

```
./diff.hh:56:28: error: no member named 'min' in namespace 'std'
    const int max_D = std::min((M + N + 1) / 2 + 1, cost_limit);
                      ~~~~~^
```
---
 src/diff.hh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/diff.hh b/src/diff.hh
index 0205ef73b..2e719669a 100644
--- a/src/diff.hh
+++ b/src/diff.hh
@@ -7,6 +7,7 @@
 
 #include "array_view.hh"
 
+#include <algorithm>
 #include <functional>
 #include <iterator>
 #include <memory>

From df9995b216c757cecf524c34286577febe9473b4 Mon Sep 17 00:00:00 2001
From: Las <las@protonmail.ch>
Date: Tue, 3 Dec 2019 15:05:40 +0900
Subject: [PATCH 2/2] Recognize .mjs files as javascript files

.mjs is the extension for javascript modules
---
 rc/filetype/javascript.kak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rc/filetype/javascript.kak b/rc/filetype/javascript.kak
index 3dfa4d409..4e39fc690 100644
--- a/rc/filetype/javascript.kak
+++ b/rc/filetype/javascript.kak
@@ -1,7 +1,7 @@
 # Detection
 # ‾‾‾‾‾‾‾‾‾
 
-hook global BufCreate .*[.](js)x? %{
+hook global BufCreate .*[.]m?(js)x? %{
     set-option buffer filetype javascript
 }