summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxime Coste <mawww@kakoune.org>2017-09-30 21:28:40 +0800
committerMaxime Coste <mawww@kakoune.org>2017-09-30 21:28:40 +0800
commit2f251c9861dfdc4c07a60295b6cdfe093dbd7b59 (patch)
tree8fe4cce90905af4d60520e656bd40c281fd831d2
parent1cfee17a165120addaed3470d09e5c3cd72fbfe1 (diff)
parent18d6b77a08cc185ffc1e1384f6271ddcdf9b77a2 (diff)
Merge remote-tracking branch 'Delapouite/shell-candidates'
-rw-r--r--README.asciidoc9
-rw-r--r--doc/manpages/commands.asciidoc13
2 files changed, 20 insertions, 2 deletions
diff --git a/README.asciidoc b/README.asciidoc
index 9aa34dc7..8f01a692 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -1553,9 +1553,16 @@ New commands can be defined using the `:def` command.
passed to this command
* `-buffer-completion`: try buffer name completion on any parameter
passed to this command
+ * `-command-completion`: try command completion on any parameter
+ passed to this command
* `-shell-completion`: following string is a shell command which takes
parameters as positional params and output one completion candidate
- per line.
+ per line. The provided shell command will run after each keypress
+ * `-shell-candidates`: following string is a shell command which takes
+ parameters as positional params and output one completion candidate
+ per line. The provided shell command will run once at the beginning
+ of each completion session, candidates are cached and then used by
+ kakoune internal fuzzy engine
* `-allow-override`: allow the new command to replace an existing one
with the same name.
* `-hidden`: do not show the command in command name completions
diff --git a/doc/manpages/commands.asciidoc b/doc/manpages/commands.asciidoc
index ae49bcb0..73aee9df 100644
--- a/doc/manpages/commands.asciidoc
+++ b/doc/manpages/commands.asciidoc
@@ -254,9 +254,20 @@ New commands can be defined using the *define-command* command:
*-buffer-completion*:::
try buffer name completion on any parameter passed to this command
+*-command-completion*:::
+ try command completion on any parameter passed to this command
+
*-shell-completion*:::
following string is a shell command which takes parameters as
- positional params and output one completion candidate per line
+ positional params and output one completion candidate per line.
+ The provided shell command will run after each keypress
+
+*-shell-candidates*:::
+ following string is a shell command which takes parameters as
+ positional params and output one completion candidate per line.
+ The provided shell command will run once at the beginning of each
+ completion session, candidates are cached and then used by kakoune
+ internal fuzzy engine
*-allow-override*:::
allow the new command to replace an existing one with the same name