kakoune: Update to 2020.01.16

== Kakoune v2020.01.16

* Expose history tree through `$kak_history` and
  `$kak_uncommitted_modifications`

* `InsertCompletionHide` parameter is the list of inserted
  ranges

5 files changed, 52 insertions, 31 deletions

diff --git a/editors/kakoune/Makefile b/editors/kakoune/Makefile
index 73e5495e8d4..0d844e0eb99 100644
--- a/editors/kakoune/Makefile
+++ b/editors/kakoune/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2019/08/27 10:36:05 nia Exp $
+# $NetBSD: Makefile,v 1.5 2020/03/22 10:35:44 nia Exp $
 
-DISTNAME=	kakoune-2019.07.01
+DISTNAME=	kakoune-2020.01.16
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mawww/}
 GITHUB_RELEASE=	v${PKGVERSION_NOREV}
@@ -18,12 +18,11 @@ USE_LANGUAGES=	c c++17
 # C++17
 GCC_REQD+=	7
 
-LDFLAGS.SunOS+=	-lsocket -lnsl
-
-FAKE_NCURSES=	yes
-
+CXXFLAGS+=	-D'KAK_BIN_PATH="${PREFIX}/bin/kak"'
 MAKE_FLAGS+=	mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 MAKE_FLAGS+=	gzip_man=no
 
+LDFLAGS.SunOS+=	-lsocket -lnsl
+
 .include "../../devel/ncursesw/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/kakoune/PLIST b/editors/kakoune/PLIST
index 54482cbf6cb..bf4862a43a9 100644
--- a/editors/kakoune/PLIST
+++ b/editors/kakoune/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2019/07/24 17:01:02 nia Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/03/22 10:35:44 nia Exp $
 bin/kak
 man/man1/kak.1
 share/doc/kak/README.asciidoc
@@ -7,9 +7,13 @@ share/kak/colors/base16.kak
 share/kak/colors/default.kak
 share/kak/colors/desertex.kak
 share/kak/colors/github.kak
+share/kak/colors/greyscale.kak
 share/kak/colors/gruvbox.kak
+share/kak/colors/kaleidoscope-dark.kak
+share/kak/colors/kaleidoscope-light.kak
 share/kak/colors/lucius.kak
 share/kak/colors/palenight.kak
+share/kak/colors/plain.kak
 share/kak/colors/red-phoenix.kak
 share/kak/colors/reeder.kak
 share/kak/colors/solarized-dark-termcolors.kak
@@ -53,6 +57,7 @@ share/kak/rc/filetype/css.kak
 share/kak/rc/filetype/cucumber.kak
 share/kak/rc/filetype/d.kak
 share/kak/rc/filetype/dart.kak
+share/kak/rc/filetype/dhall.kak
 share/kak/rc/filetype/diff.kak
 share/kak/rc/filetype/dockerfile.kak
 share/kak/rc/filetype/elixir.kak
@@ -60,8 +65,10 @@ share/kak/rc/filetype/elm.kak
 share/kak/rc/filetype/etc.kak
 share/kak/rc/filetype/exherbo.kak
 share/kak/rc/filetype/fish.kak
+share/kak/rc/filetype/fsharp.kak
 share/kak/rc/filetype/gas.kak
 share/kak/rc/filetype/git.kak
+share/kak/rc/filetype/gluon.kak
 share/kak/rc/filetype/go.kak
 share/kak/rc/filetype/haml.kak
 share/kak/rc/filetype/haskell.kak
@@ -71,12 +78,14 @@ share/kak/rc/filetype/i3.kak
 share/kak/rc/filetype/ini.kak
 share/kak/rc/filetype/java.kak
 share/kak/rc/filetype/javascript.kak
+share/kak/rc/filetype/jinja.kak
 share/kak/rc/filetype/json.kak
 share/kak/rc/filetype/julia.kak
 share/kak/rc/filetype/just.kak
 share/kak/rc/filetype/kakrc.kak
 share/kak/rc/filetype/kickstart.kak
 share/kak/rc/filetype/latex.kak
+share/kak/rc/filetype/ledger.kak
 share/kak/rc/filetype/lisp.kak
 share/kak/rc/filetype/lua.kak
 share/kak/rc/filetype/mail.kak
@@ -85,6 +94,7 @@ share/kak/rc/filetype/markdown.kak
 share/kak/rc/filetype/mercurial.kak
 share/kak/rc/filetype/moon.kak
 share/kak/rc/filetype/nim.kak
+share/kak/rc/filetype/nix.kak
 share/kak/rc/filetype/ocaml.kak
 share/kak/rc/filetype/perl.kak
 share/kak/rc/filetype/php.kak
@@ -106,6 +116,7 @@ share/kak/rc/filetype/sql.kak
 share/kak/rc/filetype/swift.kak
 share/kak/rc/filetype/systemd.kak
 share/kak/rc/filetype/taskpaper.kak
+share/kak/rc/filetype/terraform.kak
 share/kak/rc/filetype/toml.kak
 share/kak/rc/filetype/troff.kak
 share/kak/rc/filetype/tupfile.kak
@@ -117,7 +128,7 @@ share/kak/rc/tools/clang.kak
 share/kak/rc/tools/comment.kak
 share/kak/rc/tools/ctags.kak
 share/kak/rc/tools/doc.kak
-share/kak/rc/tools/formatter.kak
+share/kak/rc/tools/format.kak
 share/kak/rc/tools/git.kak
 share/kak/rc/tools/go/go-tools.kak
 share/kak/rc/tools/grep.kak
diff --git a/editors/kakoune/distinfo b/editors/kakoune/distinfo
index e26c19d43de..df48b91fd18 100644
--- a/editors/kakoune/distinfo
+++ b/editors/kakoune/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2019/07/25 15:34:48 nia Exp $
+$NetBSD: distinfo,v 1.3 2020/03/22 10:35:44 nia Exp $
 
-SHA1 (kakoune-2019.07.01.tar.bz2) = 531066fc87417f3f60f0fe6c47d9c440a67aece4
-RMD160 (kakoune-2019.07.01.tar.bz2) = 1ed222e839ef6efdb36462b0984b3b15b0307c2f
-SHA512 (kakoune-2019.07.01.tar.bz2) = 55a25046d2c46b0d947beefbf7680dc3674e1d027548e134d0fc62b416ae12018bc9518870573144f2668ce8743ec37ba0f97dbfabbaed120ccc07f87a0187c0
-Size (kakoune-2019.07.01.tar.bz2) = 452043 bytes
-SHA1 (patch-src_Makefile) = 8f6cc30df318ef4f2c9168c2e3bdb08fa952395c
+SHA1 (kakoune-2020.01.16.tar.bz2) = bb207f38942251b923935898dd40d9ca475444dd
+RMD160 (kakoune-2020.01.16.tar.bz2) = 98c7ed0c9cd77cb73426853a0a92c468a9d27bbb
+SHA512 (kakoune-2020.01.16.tar.bz2) = c7b5b2790f3ecaf3a94b72e1d2f75fbbde8a7e8d3696f8a633439eb39a7331809d7fc13290bc781350fd6efe4cd823625438fe719f99bf18cfaff8a9a5773156
+Size (kakoune-2020.01.16.tar.bz2) = 478509 bytes
+SHA1 (patch-src_Makefile) = 669a6da452be1f9cd58848819d7ae70013cefeb8
 SHA1 (patch-src_event__manager.cc) = 8666702d13d416fdb7b7cbaf55615b736f7b09a8
-SHA1 (patch-src_file.cc) = 933ce2bfe0fde31d1c3854396241340322755355
+SHA1 (patch-src_file.cc) = 5710ab3727649abcbead9da6fb78c1eb99faa430
diff --git a/editors/kakoune/patches/patch-src_Makefile b/editors/kakoune/patches/patch-src_Makefile
index 182448c102c..720fc9dd973 100644
--- a/editors/kakoune/patches/patch-src_Makefile
+++ b/editors/kakoune/patches/patch-src_Makefile
@@ -1,13 +1,10 @@
-$NetBSD: patch-src_Makefile,v 1.1 2019/07/24 17:01:02 nia Exp $
+$NetBSD: patch-src_Makefile,v 1.2 2020/03/22 10:35:44 nia Exp $
 
 Do not force -O3 or -g.
 
-Allow KAK_BIN_PATH to be used as a fallback for finding the executable
-path on more platforms.
-
---- src/Makefile.orig	2019-07-01 12:07:29.000000000 +0000
+--- src/Makefile.orig	2020-01-16 09:52:20.000000000 +0000
 +++ src/Makefile
-@@ -14,7 +14,6 @@ ifeq ($(debug),yes)
+@@ -16,7 +16,6 @@ ifeq ($(debug),yes)
      suffix := .debug
  else
      ifeq ($(debug),no)
@@ -15,16 +12,12 @@ path on more platforms.
          suffix := .opt
      else
          $(error debug should be either yes or no)
-@@ -85,10 +84,11 @@ else
- 
-     LIBS += $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --libs ncursesw)
-     NCURSES_CFLAGS += $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --cflags ncursesw)
-+    CPPFLAGS += -D'KAK_BIN_PATH="$(bindir)/kak"'
+@@ -90,7 +89,7 @@ else
      LDFLAGS += -rdynamic
  endif
  
 -CXXFLAGS += -pedantic -std=c++17 -g -Wall -Wextra -Wno-unused-parameter -Wno-sign-compare -Wno-address
 +CXXFLAGS += -pedantic -std=c++17 -Wall -Wextra -Wno-unused-parameter -Wno-sign-compare -Wno-address
  
- all : kak
- 
+ compiler := $(shell $(CXX) --version)
+ ifneq (,$(findstring clang,$(compiler)))
diff --git a/editors/kakoune/patches/patch-src_file.cc b/editors/kakoune/patches/patch-src_file.cc
index 7b60ee408f6..a4375f04b0b 100644
--- a/editors/kakoune/patches/patch-src_file.cc
+++ b/editors/kakoune/patches/patch-src_file.cc
@@ -1,11 +1,29 @@
-$NetBSD: patch-src_file.cc,v 1.1 2019/07/24 17:01:02 nia Exp $
+$NetBSD: patch-src_file.cc,v 1.2 2020/03/22 10:35:44 nia Exp $
 
 Allow KAK_BIN_PATH to be used as a fallback for finding the executable
 path on more platforms.
 
---- src/file.cc.orig	2019-07-01 12:07:29.000000000 +0000
+--- src/file.cc.orig	2020-01-16 09:52:20.000000000 +0000
 +++ src/file.cc
-@@ -641,10 +641,8 @@ String get_kak_binary_path()
+@@ -21,7 +21,7 @@
+ #include <sys/select.h>
+ #include <unistd.h>
+ 
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+ #include <sys/sysctl.h>
+ #endif
+ 
+@@ -624,7 +624,7 @@ String get_kak_binary_path()
+     kak_assert(res != -1);
+     buffer[res] = '\0';
+     return buffer;
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__NetBSD__)
+     int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1};
+     size_t res = sizeof(buffer);
+     sysctl(mib, 4, buffer, &res, NULL, 0);
+@@ -648,10 +648,8 @@ String get_kak_binary_path()
      kak_assert(res != -1);
      buffer[res] = '\0';
      return buffer;