summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorIgor Ramazanov <igor.ramazanov@protonmail.com>2025-02-12 23:46:00 +0000
committerGitHub <noreply@github.com>2025-02-12 23:46:00 +0000
commitb548d7c2b9c0e90249e956bbfdd78ff5fad3c2d5 (patch)
tree097a077c569078e372abd6ddf596e56cf143c7ef /doc
parentce4dc805e375dbd8c0477ad5005c2110f83de2aa (diff)
parent0a4bea856fe6ddd6420d6d7141b20eed8fe0bd25 (diff)
Merge branch 'mawww:master' into contrib/gendocs.sh
Diffstat (limited to 'doc')
-rw-r--r--doc/pages/changelog.asciidoc6
-rw-r--r--doc/pages/commands.asciidoc3
-rw-r--r--doc/pages/keys.asciidoc7
3 files changed, 13 insertions, 3 deletions
diff --git a/doc/pages/changelog.asciidoc b/doc/pages/changelog.asciidoc
index f443f207..7d92fa42 100644
--- a/doc/pages/changelog.asciidoc
+++ b/doc/pages/changelog.asciidoc
@@ -6,10 +6,16 @@ released versions.
== Development version
* Expose env vars that are mentioned in the arguments passed to shell expansions
+
* Support for colored double underlines
+
* `git apply` can now operate on selected changes in the current buffer's
file (useful for quick (un)staging and reverting)
+* `prompt -history-register` switch to specify which register to use for
+ a prompt history.
+
+
== Kakoune 2024.05.18
* Fixed tests on Alpine Linux and *BSD
diff --git a/doc/pages/commands.asciidoc b/doc/pages/commands.asciidoc
index 6b5a48e5..b0fb104e 100644
--- a/doc/pages/commands.asciidoc
+++ b/doc/pages/commands.asciidoc
@@ -319,6 +319,9 @@ but not really useful in that context.
will have this command executed whenever the prompt content changes
or the prompt is aborted, respectively.
+ The *-history-register <register-name>* switch selects which register
+ to use to load and store history for this prompt.
+
Completion support can be controlled with the same switches provided
by the *define-command* command, see
<<declaring-new-commands,Declaring new commands>>.
diff --git a/doc/pages/keys.asciidoc b/doc/pages/keys.asciidoc
index 6c9ace8b..f346887e 100644
--- a/doc/pages/keys.asciidoc
+++ b/doc/pages/keys.asciidoc
@@ -803,9 +803,10 @@ The following keys are recognized by this mode to help with editing
select previous completion candidate
*<c-r>*::
- insert then content of the register given by next key, if next key
- has the Alt modifier, it will insert all values in the register
- joined with spaces, else it will insert the main one
+ insert the content of the register given by next key, if next key has
+ the Alt modifier, it will insert all values in the register joined with
+ spaces, else it will insert the main one. if it has the Control modifier,
+ it will quote the inserted value(s).
*<c-v>*::
insert next keystroke without interpreting it