Merge remote-tracking branch 'origin/main' into save-conversations

2023-06-26 15:59:19 +02:00
parent 9d4dd5c42b 3f4a06f576
commit 00e37bc2a2
13 changed files with 200 additions and 122 deletions
@@ -137,7 +137,7 @@
    }
  },
  {
-    "context": "Editor && vim_mode == normal && vim_operator == none && !VimWaiting",
+    "context": "Editor && vim_mode == normal && (vim_operator == none || vim_operator == n) && !VimWaiting",
    "bindings": {
      "c": [
        "vim::PushOperator",
@@ -220,7 +220,8 @@
      "r": [
        "vim::PushOperator",
        "Replace"
-      ]
+      ],
+      "s": "vim::Substitute"
    }
  },
  {
@@ -307,6 +308,7 @@
      "x": "vim::VisualDelete",
      "y": "vim::VisualYank",
      "p": "vim::VisualPaste",
+      "s": "vim::Substitute",
      "r": [
        "vim::PushOperator",
        "Replace"