Merge branch 'mawww:master' into contrib/gendocs.sh

5 files changed, 26 insertions, 14 deletions

diff --git a/src/commands.cc b/src/commands.cc
index 0f892004..086097ec 100644
--- a/src/commands.cc
+++ b/src/commands.cc
@@ -2269,6 +2269,7 @@ const CommandDesc prompt_cmd = {
           { "shell-completion", { {}, "use shell command completion for prompt" } },
           { "shell-script-completion", { ArgCompleter{}, "use shell command completion for prompt" } },
           { "shell-script-candidates", { ArgCompleter{}, "use shell command completion for prompt" } },
+          { "history-register", { ArgCompleter{}, "register to read and store history to, default to '_'"} },
           { "on-change", { ArgCompleter{}, "command to execute whenever the prompt changes" } },
           { "on-abort", { ArgCompleter{}, "command to execute whenever the prompt is canceled" } } },
         ParameterDesc::Flags::None, 2, 2
@@ -2288,9 +2289,11 @@ const CommandDesc prompt_cmd = {
         const auto flags = parser.get_switch("password") ?
             PromptFlags::Password : PromptFlags::None;
 
+        auto history_register = RegisterManager::parse_register_name(parser.get_switch("history-register").value_or("_"));
+
         context.input_handler().prompt(
             parser[0], initstr.str(), {}, context.faces()["Prompt"],
-            flags, '_', std::move(completer),
+            flags, history_register, std::move(completer),
             [command,
              on_change = parser.get_switch("on-change").value_or("").str(),
              on_abort = parser.get_switch("on-abort").value_or("").str(),
diff --git a/src/input_handler.cc b/src/input_handler.cc
index 0f2c8987..ea803217 100644
--- a/src/input_handler.cc
+++ b/src/input_handler.cc
@@ -764,15 +764,17 @@ public:
             on_next_key_with_autoinfo(context(), "register", KeymapMode::None,
                 [this](Key key, Context&) {
                     const bool joined = (bool)(key.modifiers & Key::Modifiers::Alt);
-                    key.modifiers &= ~Key::Modifiers::Alt;
+                    const bool quoted = (bool)(key.modifiers & Key::Modifiers::Control);
+                    key.modifiers &= ~(Key::Modifiers::Alt | Key::Modifiers::Control);
 
                     auto cp = key.codepoint();
                     if (not cp or key == Key::Escape)
                         return;
 
+                    auto* quoter = Kakoune::quoter(quoted ? Quoting::Kakoune : Quoting::Raw);
                     m_line_editor.insert(
-                        joined ? join(RegisterManager::instance()[*cp].get(context()), ' ', false)
-                               : context().main_sel_register_value(String{*cp}));
+                        joined ? join(RegisterManager::instance()[*cp].get(context()) | transform(quoter), ' ', false)
+                               : quoter(context().main_sel_register_value(String{*cp})));
 
                     display();
                     m_line_changed = true;
diff --git a/src/main.cc b/src/main.cc
index ac9af4ca..9f479768 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -49,6 +49,7 @@ struct {
         "» kak_* appearing in shell arguments will be added to the environment\n"
         "» {+U}double underline{} support\n"
         "» {+u}git apply{} can stage/revert selected changes to current buffer\n"
+        "» {+u}prompt -history-register{} switch\n"
     }, {
         20240518,
         "» Fix tests failing on some platforms\n"
@@ -606,7 +607,7 @@ void register_options()
                        "    terminal_info_max_width        int\n",
                        UserInterface::Options{});
     reg.declare_option("modelinefmt", "format string used to generate the modeline",
-                       "%val{bufname} %val{cursor_line}:%val{cursor_char_column} {{context_info}} {{mode_info}} - %val{client}@[%val{session}]"_str);
+                       "%val{bufname} %val{cursor_line}:%val{cursor_char_column} {{busy_indicator}} {{context_info}} {{mode_info}} - %val{client}@[%val{session}]"_str);
 
     reg.declare_option("debug", "various debug flags", DebugFlags::None);
     reg.declare_option("readonly", "prevent buffers from being modified", false);
diff --git a/src/register_manager.cc b/src/register_manager.cc
index b9d09a52..987849e1 100644
--- a/src/register_manager.cc
+++ b/src/register_manager.cc
@@ -70,7 +70,7 @@ const String& HistoryRegister::get_main(const Context&, size_t)
     return m_content.empty() ? String::ms_empty : m_content.front();
 }
 
-static const HashMap<StringView, Codepoint> reg_names {
+static const HashMap<StringView, char> reg_names {
     { "slash", '/' },
     { "dquote", '"' },
     { "pipe", '|' },
@@ -83,18 +83,23 @@ static const HashMap<StringView, Codepoint> reg_names {
     { "colon", ':' }
 };
 
-Register& RegisterManager::operator[](StringView reg) const
+char RegisterManager::parse_register_name(StringView reg)
 {
     if (reg.length() == 1)
-        return (*this)[reg[0_byte]];
+        return reg[0_byte];
 
     auto it = reg_names.find(reg);
     if (it == reg_names.end())
         throw runtime_error(format("no such register: '{}'", reg));
-    return (*this)[it->value];
+    return it->value;
+}
+
+Register& RegisterManager::operator[](StringView reg) const
+{
+    return (*this)[parse_register_name(reg)];
 }
 
-Register& RegisterManager::operator[](Codepoint c) const
+Register& RegisterManager::operator[](char c) const
 {
     c = to_lower(c);
     auto it = m_registers.find(c);
@@ -104,7 +109,7 @@ Register& RegisterManager::operator[](Codepoint c) const
     return *(it->value);
 }
 
-void RegisterManager::add_register(Codepoint c, std::unique_ptr<Register> reg)
+void RegisterManager::add_register(char c, std::unique_ptr<Register> reg)
 {
     auto& reg_ptr = m_registers[c];
     kak_assert(not reg_ptr);
diff --git a/src/register_manager.hh b/src/register_manager.hh
index 9d843eff..6c7cf084 100644
--- a/src/register_manager.hh
+++ b/src/register_manager.hh
@@ -118,16 +118,17 @@ public:
 class RegisterManager : public Singleton<RegisterManager>
 {
 public:
+    static char parse_register_name(StringView reg);
     Register& operator[](StringView reg) const;
-    Register& operator[](Codepoint c) const;
-    void add_register(Codepoint c, std::unique_ptr<Register> reg);
+    Register& operator[](char c) const;
+    void add_register(char c, std::unique_ptr<Register> reg);
     CandidateList complete_register_name(StringView prefix, ByteCount cursor_pos) const;
 
     auto begin() const { return m_registers.begin(); }
     auto end() const { return m_registers.end(); }
 
 protected:
-    HashMap<Codepoint, std::unique_ptr<Register>, MemoryDomain::Registers> m_registers;
+    HashMap<char, std::unique_ptr<Register>, MemoryDomain::Registers> m_registers;
 };
 
 }