From fa72d27f9a78d6af8052523d9166a31000d4cba8 Mon Sep 17 00:00:00 2001
From: Maxime Coste <frrrwww@gmail.com>
Date: Mon, 23 Dec 2013 21:26:07 +0000
Subject: [PATCH] Make kak more installable

* Kak relies on the kakrc file to be in ../share/kak/kakrc relative
to kak binary rather than in the same directory
* Added an install target to the Makefile
---
 {src/rc => rc}/asciidoc.kak  |  0
 {src/rc => rc}/clang.kak     |  0
 {src/rc => rc}/client.kak    |  0
 {src/rc => rc}/cpp.kak       |  6 ++++--
 {src/rc => rc}/ctags.kak     |  0
 {src/rc => rc}/diff.kak      |  0
 {src/rc => rc}/git-tools.kak |  0
 {src/rc => rc}/git.kak       |  0
 {src/rc => rc}/global.kak    |  0
 {src/rc => rc}/grep.kak      |  0
 {src/rc => rc}/kakrc.kak     |  1 +
 {src/rc => rc}/mail.kak      |  0
 {src/rc => rc}/make.kak      |  0
 {src/rc => rc}/man.kak       |  0
 {src/rc => rc}/mime.kak      |  0
 {src/rc => rc}/sh.kak        |  0
 {src => share/kak}/kakrc     |  0
 src/Makefile                 | 21 +++++++++++++++++++--
 src/main.cc                  |  2 +-
 19 files changed, 25 insertions(+), 5 deletions(-)
 rename {src/rc => rc}/asciidoc.kak (100%)
 rename {src/rc => rc}/clang.kak (100%)
 rename {src/rc => rc}/client.kak (100%)
 rename {src/rc => rc}/cpp.kak (92%)
 rename {src/rc => rc}/ctags.kak (100%)
 rename {src/rc => rc}/diff.kak (100%)
 rename {src/rc => rc}/git-tools.kak (100%)
 rename {src/rc => rc}/git.kak (100%)
 rename {src/rc => rc}/global.kak (100%)
 rename {src/rc => rc}/grep.kak (100%)
 rename {src/rc => rc}/kakrc.kak (94%)
 rename {src/rc => rc}/mail.kak (100%)
 rename {src/rc => rc}/make.kak (100%)
 rename {src/rc => rc}/man.kak (100%)
 rename {src/rc => rc}/mime.kak (100%)
 rename {src/rc => rc}/sh.kak (100%)
 rename {src => share/kak}/kakrc (100%)

diff --git a/src/rc/asciidoc.kak b/rc/asciidoc.kak
similarity index 100%
rename from src/rc/asciidoc.kak
rename to rc/asciidoc.kak
diff --git a/src/rc/clang.kak b/rc/clang.kak
similarity index 100%
rename from src/rc/clang.kak
rename to rc/clang.kak
diff --git a/src/rc/client.kak b/rc/client.kak
similarity index 100%
rename from src/rc/client.kak
rename to rc/client.kak
diff --git a/src/rc/cpp.kak b/rc/cpp.kak
similarity index 92%
rename from src/rc/cpp.kak
rename to rc/cpp.kak
index 2b98af9a..bc06fc89 100644
--- a/src/rc/cpp.kak
+++ b/rc/cpp.kak
@@ -16,6 +16,8 @@ def -hidden _cpp_indent_on_new_line %~
         try %{ exec -draft k<a-x> s \h+$ <ret>d }
         # align to opening paren of previous line
         try %{ exec -draft [( <a-k> \`\([^\n]+\n[^\n]*\n?\' <ret> s \`\(\h*.|.\' <ret> & }
+        # align to previous statement start when previous line closed a parenthesis
+        # try %{ exec -draft <a-?>\)M<a-k>\`\(.*\)[^\n()]*\n\h*\n?\'<ret>s\`|.\'<ret>1<a-&> }
         # copy // comments prefix
         try %{ exec -draft <c-s>k<a-x> s ^\h*\K(/{2,}) <ret> y<c-o>P }
         # indent after visibility specifier
@@ -31,8 +33,8 @@ def -hidden _cpp_indent_on_opening_curly_brace %[
 ]
 
 def -hidden _cpp_indent_on_closing_curly_brace %[
-    # deindent on insert } alone on a line
-    try %[ exec -draft <a-h><a-k> ^\h+\}$ <ret> < ]
+    # align to opening curly brace when alone on a line
+    try %[ exec -itersel -draft <a-h><a-k>^\h+\}$<ret>hms\`|.\'<ret>1<a-&> ]
     # add ; after } if class or struct definition
     try %[ exec -draft "hm<space><a-?>(class|struct)<ret><a-k>\`(class|struct)[^{}\n]+(\n)?\s*\{\'<ret><a-space>ma;<esc>" ]
 ]
diff --git a/src/rc/ctags.kak b/rc/ctags.kak
similarity index 100%
rename from src/rc/ctags.kak
rename to rc/ctags.kak
diff --git a/src/rc/diff.kak b/rc/diff.kak
similarity index 100%
rename from src/rc/diff.kak
rename to rc/diff.kak
diff --git a/src/rc/git-tools.kak b/rc/git-tools.kak
similarity index 100%
rename from src/rc/git-tools.kak
rename to rc/git-tools.kak
diff --git a/src/rc/git.kak b/rc/git.kak
similarity index 100%
rename from src/rc/git.kak
rename to rc/git.kak
diff --git a/src/rc/global.kak b/rc/global.kak
similarity index 100%
rename from src/rc/global.kak
rename to rc/global.kak
diff --git a/src/rc/grep.kak b/rc/grep.kak
similarity index 100%
rename from src/rc/grep.kak
rename to rc/grep.kak
diff --git a/src/rc/kakrc.kak b/rc/kakrc.kak
similarity index 94%
rename from src/rc/kakrc.kak
rename to rc/kakrc.kak
index 9d1026b1..3cb4056d 100644
--- a/src/rc/kakrc.kak
+++ b/rc/kakrc.kak
@@ -10,6 +10,7 @@ addhl -def-group kakrc regex (?<=\<set)\h+((global|buffer|window)|(\S+))\h+(\S+)
 addhl -def-group kakrc regex (?<=\<regex)\h+(\S+) 1:string
 addhl -def-group kakrc regex (?<!\\)(["'])(?:\\\1|.)*?\1 0:string
 addhl -def-group kakrc regex (^|\h)\#[^\n]*\n 0:comment
+addhl -def-group kakrc region_ref '%sh\{' '\}' sh
 
 hook global WinSetOption filetype=kak %{ addhl ref kakrc }
 hook global WinSetOption filetype=(?!kak).* %{ rmhl kakrc }
diff --git a/src/rc/mail.kak b/rc/mail.kak
similarity index 100%
rename from src/rc/mail.kak
rename to rc/mail.kak
diff --git a/src/rc/make.kak b/rc/make.kak
similarity index 100%
rename from src/rc/make.kak
rename to rc/make.kak
diff --git a/src/rc/man.kak b/rc/man.kak
similarity index 100%
rename from src/rc/man.kak
rename to rc/man.kak
diff --git a/src/rc/mime.kak b/rc/mime.kak
similarity index 100%
rename from src/rc/mime.kak
rename to rc/mime.kak
diff --git a/src/rc/sh.kak b/rc/sh.kak
similarity index 100%
rename from src/rc/sh.kak
rename to rc/sh.kak
diff --git a/src/kakrc b/share/kak/kakrc
similarity index 100%
rename from src/kakrc
rename to share/kak/kakrc
diff --git a/src/Makefile b/src/Makefile
index de2cb889..367aee35 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,6 +2,13 @@ sources := $(wildcard *.cc)
 objects := $(addprefix ., $(sources:.cc=.o))
 deps := $(addprefix ., $(sources:.cc=.d))
 
+PREFIX ?= /usr/local
+DESTDIR ?= /
+
+bindir := $(DESTDIR)$(PREFIX)/bin
+sharedir := $(DESTDIR)$(PREFIX)/share/kak
+docdir := $(DESTDIR)$(PREFIX)/share/doc/kak
+
 CXXFLAGS += -std=gnu++11 -g -Wall -Wno-reorder -Wno-sign-compare -pedantic
 LIBS += -lncursesw
 
@@ -41,6 +48,16 @@ XDG_CONFIG_HOME ?= $(HOME)/.config
 
 userconfig:
 	mkdir -p $(XDG_CONFIG_HOME)/kak/autoload
-	ln -s $(CURDIR)/rc/{asciidoc,client,cpp,diff,git,grep,kakrc,mime,make,sh,mail,man}.kak $(XDG_CONFIG_HOME)/kak/autoload/
+	ln -s $(CURDIR)/../rc/{asciidoc,client,cpp,diff,git,grep,kakrc,mime,make,sh,mail,man}.kak $(XDG_CONFIG_HOME)/kak/autoload/
 
-.PHONY: tags userconfig
+install: kak
+	mkdir -p $(bindir)
+	install -D -m 0755 kak $(bindir)
+	mkdir -p $(sharedir)/rc
+	install -D -m 0644 ../share/kak/kakrc $(sharedir)
+	install -D -m 0644 ../rc/* $(sharedir)/rc
+	mkdir -p $(docdir)
+	install -D -m 0644 ../README.asciidoc $(docdir)
+	install -D -m 0644 ../doc/* $(docdir)
+
+.PHONY: tags userconfig install
diff --git a/src/main.cc b/src/main.cc
index 3cf6b926..3eab89f5 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -52,7 +52,7 @@ String runtime_directory()
     char* ptr = strrchr(buffer, '/');
     if (not ptr)
         throw runtime_error("unable to determine runtime directory");
-    return String(buffer, ptr);
+    return String(buffer, ptr) + "/../share/kak";
 }
 
 void register_env_vars()