From b2a853cfc2e52559b70d0ad3bfc4a49f3ed16833 Mon Sep 17 00:00:00 2001
From: Maxime Coste <mawww@kakoune.org>
Date: Sat, 17 Jun 2023 17:10:05 +1000
Subject: [PATCH] Add a few missing entries to the changelog

---
 doc/pages/changelog.asciidoc | 12 +++++++++++-
 src/main.cc                  |  1 +
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/doc/pages/changelog.asciidoc b/doc/pages/changelog.asciidoc
index cb92aed9..9cbd18ef 100644
--- a/doc/pages/changelog.asciidoc
+++ b/doc/pages/changelog.asciidoc
@@ -6,8 +6,18 @@ released versions.
 == Development version
 
 * History is now stored linearly instead of in a tree
+
 * `<a-u>` and `<a-U>` now undo selection history
-* `%exp{...}` expansions provide flexible quoting for expanded strings (as double quoted strings)
+
+* `%exp{...}` expansions provide flexible quoting for expanded strings
+  (as double quoted strings)
+
+* `<c-g>` cancels the current operation and goes back to the main event
+  loop, this provides an escape hatch when Kakoune seems to hang due to
+  a costly operation
+
+* `show-matching -previous` highlighter will fall back onto the character
+  preceeding the cursor
 
 == Kakoune 2022.10.31
 
diff --git a/src/main.cc b/src/main.cc
index aabe45fd..69bcc2f5 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -50,6 +50,7 @@ struct {
         "» {+u}%exp\\{...}{} expansions provide flexible quoting for expanded "
         "strings (as double quoted strings)\n"
         "» {+u}show-matching -previous{} switch\n"
+        "» {+b}<c-g>{} to cancel current operation\n"
     }, {
         20221031,
         "» {+b}<esc>{} does not end macro recording anymore, use {+b}Q{}\n"