Merge remote-tracking branch 'Laaas/patch-1'

2019-12-03 21:11:14 +11:00 · 2019-12-03 21:11:14 +11:00 · 5c1433ee65
commit 5c1433ee65
parent b5baac4336 df9995b216
2 changed files with 2 additions and 1 deletions
--- 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
 }

--- a/src/diff.hh
+++ b/src/diff.hh
@ -7,6 +7,7 @@

 #include "array_view.hh"

+#include <algorithm>
 #include <functional>
 #include <iterator>
 #include <memory>