Merge branch 'master' of git://github.com/ewollesen/kakoune

This commit is contained in:
Maxime Coste 2016-12-16 00:15:18 +00:00
commit 4dd17e26b4

View File

@ -654,9 +654,9 @@ command `q!` has to be used).
* `runtime <filename>`: execute commands in <filename>, <filename> * `runtime <filename>`: execute commands in <filename>, <filename>
is relative to kak executable path. is relative to kak executable path.
* `colorscheme <name>`: load named colorscheme. * `colorscheme <name>`: load named colorscheme.
* `nameclient <name>`: set current client name * `rename-client <name>`: set current client name
* `namebuf <name>`: set current buffer name * `rename-buffer <name>`: set current buffer name
* `namesession <name>`: set current session name * `rename-session <name>`: set current session name
* `echo [options] <text>`: show <text> in status line, with the following options: * `echo [options] <text>`: show <text> in status line, with the following options:
** `-color` <face>: print the given text with <face>, most commonly `Error` or `Information` ** `-color` <face>: print the given text with <face>, most commonly `Error` or `Information`
** `-markup`: expand the markup strings in <text> ** `-markup`: expand the markup strings in <text>