Merge pull request #382 from tshino/update-awesome-emacs

Update keymap wrapper for Awesome Emacs Keymap v0.61.2
tshino · Jun 24, 2024 · 4e88a1b · 4e88a1b
2 parents 369f5f0 + 5cf04f7
commit 4e88a1b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to the Keyboard Macro Bata extension will be documented in this file.
 
+### [Unreleased]
+- Update
+  - Updated keymap wrapper for Awesome Emacs Keymap (v0.61.2). [#382](https://github.com/tshino/vscode-kb-macro/pull/382)
+
 ### [0.13.16] - 2024-06-08
 - Update
   - Updated default keybindings wrappers based on VS Code 1.90.0. [#372](https://github.com/tshino/vscode-kb-macro/pull/372)

diff --git a/keymap-wrapper/README.md b/keymap-wrapper/README.md
@@ -17,7 +17,7 @@ Click the keymap wrapper link in the table below, which opens a JSON file. Copy
 | Keymap extension | Keymap wrapper | Last updated | Start recording | Stop recording | Playback |
 | ---------------- | -------------- | ------------ | ---------- | --------- | -------- |
 | [Atom Keymap](https://marketplace.visualstudio.com/items?itemName=ms-vscode.atom-keybindings) | [link](ms-vscode.atom-keybindings.json) | 2023-01-24 | `Ctrl+Alt+R` | `Ctrl+Alt+R` | `Ctrl+Alt+P` |
-| [Awesome Emacs Keymap](https://marketplace.visualstudio.com/items?itemName=tuttieee.emacs-mcx) | [link](tuttieee.emacs-mcx.json) | 2024-05-17 | `C-x S-9` | `C-x S-0` | `C-x e` |
+| [Awesome Emacs Keymap](https://marketplace.visualstudio.com/items?itemName=tuttieee.emacs-mcx) | [link](tuttieee.emacs-mcx.json) | 2024-06-24 | `C-x S-9` | `C-x S-0` | `C-x e` |
 | [Delphi Keymap](https://marketplace.visualstudio.com/items?itemName=alefragnani.delphi-keybindings) | [link](alefragnani.delphi-keybindings.json) | 2024-04-07 | `Ctrl/Cmd+Shift+R` | `Ctrl/Cmd+Shift+R` | `Ctrl/Cmd+Shift+P` |
 | [Notepad++ Keymap](https://marketplace.visualstudio.com/items?itemName=ms-vscode.notepadplusplus-keybindings) | [link](ms-vscode.notepadplusplus-keybindings.json) | 2023-01-08 | `Ctrl+Shift+R` | `Ctrl+Shift+R` | `Ctrl+Shift+P` |
 | [Sublime Text Keymap](https://marketplace.visualstudio.com/items?itemName=ms-vscode.sublime-keybindings) | [link](ms-vscode.sublime-keybindings.json) | 2024-02-14 | `Ctrl/Cmd+Q` | `Ctrl/Cmd+Q` | `Ctrl/Cmd+Shift+Q` |

diff --git a/keymap-wrapper/tuttieee.emacs-mcx.json b/keymap-wrapper/tuttieee.emacs-mcx.json
@@ -1,5 +1,5 @@
 [
-	// Keymap wrapper for Awesome Emacs Keymap v0.61.0
+	// Keymap wrapper for Awesome Emacs Keymap v0.61.2
 	// (required by Keyboard Macro Beta)
 	// The latest version can be found at:
 	// https://github.com/tshino/vscode-kb-macro/blob/main/keymap-wrapper/README.md
@@ -894,11 +894,11 @@
 	{ "key": "alt+backspace", "command": "",
 		"when": "kb-macro.active && isWindows && replaceInputFocussed && !isComposing" },
 	{ "key": "alt+s o", "command": "kb-macro.wrap", "args": { "command": "workbench.action.quickTextSearch" },
-		"when": "kb-macro.active && editorFocus && !config.emacs-mcx.useMetaPrefixMacCmd" },
+		"when": "kb-macro.active && !config.emacs-mcx.useMetaPrefixMacCmd" },
 	{ "key": "cmd+s o", "command": "kb-macro.wrap", "args": { "command": "workbench.action.quickTextSearch" },
-		"when": "kb-macro.active && isMac && editorFocus && config.emacs-mcx.useMetaPrefixMacCmd" },
+		"when": "kb-macro.active && isMac && config.emacs-mcx.useMetaPrefixMacCmd" },
 	{ "key": "alt+s o", "command": "kb-macro.wrap", "args": { "command": "workbench.action.quickTextSearch" },
-		"when": "kb-macro.active && !isMac && editorFocus && config.emacs-mcx.useMetaPrefixMacCmd" },
+		"when": "kb-macro.active && !isMac && config.emacs-mcx.useMetaPrefixMacCmd" },
 	{ "key": "ctrl+alt+n", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.addSelectionToNextFindMatch", "await": "selection" },
 		"when": "kb-macro.active && editorFocus && !config.emacs-mcx.useMetaPrefixMacCmd" },
 	{ "key": "ctrl+cmd+n", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.addSelectionToNextFindMatch", "await": "selection" },
@@ -1844,7 +1844,7 @@
 	{ "key": "ctrl+x j", "command": "kb-macro.wrap", "args": { "command": "workbench.action.togglePanel" },
 		"when": "kb-macro.active && !terminalFocus" },
 	{ "key": "ctrl+i", "command": "kb-macro.wrap", "args": { "command": "tab" },
-		"when": "kb-macro.active" },
+		"when": "kb-macro.active && editorTextFocus && !editorReadonly && !editorTabMovesFocus" },
 	{ "key": "ctrl+i", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.tabToTabStop", "await": "document selection" },
 		"when": "kb-macro.active && config.emacs-mcx.emacsLikeTab && editorTextFocus && !editorReadonly && !inlineSuggestionVisible && !editorHoverFocused && !editorTabMovesFocus && !suggestWidgetVisible && !inSnippetMode && !editorTabCompletion && !editorParameterHintsVisible" },
 	{ "key": "tab", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.tabToTabStop", "await": "document selection" },