From 3e67b20245f2b4cc257927b3a14e50563a46b2d3 Mon Sep 17 00:00:00 2001 From: Eike Plack Date: Thu, 19 Jan 2017 00:47:51 +0100 Subject: [PATCH 1/3] Fix misleading wording --- doc/kak.1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/kak.1.txt b/doc/kak.1.txt index cacd6c5b..a169bdbb 100644 --- a/doc/kak.1.txt +++ b/doc/kak.1.txt @@ -51,7 +51,7 @@ OPTIONS connect to the given session -s :: - rename the current session name to *session_id* + set the current session name to *session_id* -ui :: select the user interface, can be one of 'ncurses', 'dummy' or 'json' From fea555d0e7055e1a8e981d89c37ec3e34d1d42be Mon Sep 17 00:00:00 2001 From: Eike Plack Date: Thu, 19 Jan 2017 22:52:42 +0100 Subject: [PATCH 2/3] Fix escaping * for reference: https://github.com/asciidoctor/asciidoctor/issues/1208 --- README.asciidoc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.asciidoc b/README.asciidoc index c5a824a0..88ffd808 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -5,6 +5,7 @@ :travis-url: https://travis-ci.org/mawww/kakoune :icons: font :toc: right +:pp: ++ TL;DR ----- @@ -99,8 +100,8 @@ Building Kakoune dependencies are: - * A C\+\+11 compliant compiler (GCC >= 5 or clang >= 3.4) along with its - associated C\+\+ standard library (libstdc\+\+ or libc\+\+) + * A {cpp}11 compliant compiler (GCC >= 5 or clang >= 3.4) along with its + associated {cpp} standard library (libstdc{pp} or libc{pp}) * boost (>= 1.50) * ncurses with wide-characters support (>= 5.3, generally referred to as libncursesw) * asciidoc (for the `a2k` tool), to generate man pages From 8ff2d0ba4110cde987595ba37bc12ad4c7aadb7d Mon Sep 17 00:00:00 2001 From: Eike Plack Date: Thu, 19 Jan 2017 22:56:27 +0100 Subject: [PATCH 3/3] Document +line[:column] --- README.asciidoc | 1 + doc/kak.1.txt | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.asciidoc b/README.asciidoc index 88ffd808..28f4b41f 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -244,6 +244,7 @@ Just running *kak* launch a new kak session with a client on local terminal. * `-l`: list existing sessions, and check the dead ones * `-clear`: clear dead sessions socket files * `-ro`: prevent modifications to all buffers from being saved to disk + * `+line[:column]`: specify a target line and column for the first file Configuration ^^^^^^^^^^^^^ diff --git a/doc/kak.1.txt b/doc/kak.1.txt index a169bdbb..4c7710c9 100644 --- a/doc/kak.1.txt +++ b/doc/kak.1.txt @@ -7,7 +7,7 @@ kak - a vim inspired, selection oriented code editor SYNOPSIS -------- -*kak* [-q] [-n] [-l] [-ro] [-clear] [-ui ui_type] [-e command] [-f keys] [-p session_id] [-c session_id|[[-d] -s session_id] file ... +*kak* [-q] [-n] [-l] [-ro] [-clear] [-ui ui_type] [-e command] [-f keys] [-p session_id] [-c session_id|[[-d] -s session_id] [+line[:column]] file ... DESCRIPTION ----------- @@ -62,6 +62,9 @@ OPTIONS -ro:: enter in 'readonly mode', all the buffers opened will not be written to disk ++line[:column]:: + specify a target line and column for the first file + file:: one or more files to edit