From d4128d57de0d8199c0371ae33e3619b16e8fb350 Mon Sep 17 00:00:00 2001 From: tshino Date: Fri, 25 Nov 2022 23:56:11 +0900 Subject: [PATCH 1/3] Update for Awesome Emacs Keymap (v0.47.0) --- keymap-wrapper/README.md | 2 +- keymap-wrapper/tuttieee.emacs-mcx.config.json | 2 +- keymap-wrapper/tuttieee.emacs-mcx.json | 54 ++++++++++++++++++- 3 files changed, 55 insertions(+), 3 deletions(-) diff --git a/keymap-wrapper/README.md b/keymap-wrapper/README.md index 0f75b5ce..4ba7344b 100644 --- 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) | 2022-04-05 | `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) | 2022-11-18 | `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) | 2022-11-25 | `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) | 2022-10-09 | `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) | 2021-12-26 | `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) | 2021-12-21 | `Ctrl/Cmd+Q` | `Ctrl/Cmd+Q` | `Ctrl/Cmd+Shift+Q` | diff --git a/keymap-wrapper/tuttieee.emacs-mcx.config.json b/keymap-wrapper/tuttieee.emacs-mcx.config.json index b10e5435..30e73c3b 100644 --- a/keymap-wrapper/tuttieee.emacs-mcx.config.json +++ b/keymap-wrapper/tuttieee.emacs-mcx.config.json @@ -1,7 +1,7 @@ { "base": { "type": "url", - "url": "https://github.com/whitphx/vscode-emacs-mcx/raw/v0.46.0/package.json" + "url": "https://github.com/whitphx/vscode-emacs-mcx/raw/v0.47.0/package.json" }, "awaitOptions": [ [ "emacs-mcx.forwardChar", "selection" ], diff --git a/keymap-wrapper/tuttieee.emacs-mcx.json b/keymap-wrapper/tuttieee.emacs-mcx.json index c00389d2..784d2de3 100644 --- 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.46.0 + // Keymap wrapper for Awesome Emacs Keymap v0.47.0 // (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 @@ -557,6 +557,54 @@ "when": "kb-macro.recording && !config.emacs-mcx.cursorMoveOnFindWidget && editorFocus && findWidgetVisible && !replaceInputFocussed && !isComposing && config.emacs-mcx.useMetaPrefixEscape" }, { "key": "ctrl+[ b", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.isearchExit", "args": { "then": "emacs-mcx.backwardWord" }, "await": "document selection" }, "when": "kb-macro.recording && !config.emacs-mcx.cursorMoveOnFindWidget && editorFocus && findWidgetVisible && !replaceInputFocussed && !isComposing && config.emacs-mcx.useMetaPrefixCtrlLeftBracket" }, + { "key": "ctrl+right", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.forwardWord", "await": "selection" }, + "when": "kb-macro.recording && editorTextFocus" }, + { "key": "alt+right", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.forwardWord", "await": "selection" }, + "when": "kb-macro.recording && editorTextFocus && !config.emacs-mcx.useMetaPrefixMacCmd" }, + { "key": "cmd+right", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.forwardWord", "await": "selection" }, + "when": "kb-macro.recording && isMac && editorTextFocus && config.emacs-mcx.useMetaPrefixMacCmd" }, + { "key": "alt+right", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.forwardWord", "await": "selection" }, + "when": "kb-macro.recording && !isMac && editorTextFocus && config.emacs-mcx.useMetaPrefixMacCmd" }, + { "key": "escape right", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.forwardWord", "await": "selection" }, + "when": "kb-macro.recording && editorTextFocus && config.emacs-mcx.useMetaPrefixEscape" }, + { "key": "ctrl+[ right", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.forwardWord", "await": "selection" }, + "when": "kb-macro.recording && editorTextFocus && config.emacs-mcx.useMetaPrefixCtrlLeftBracket" }, + { "key": "ctrl+right", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.isearchExit", "args": { "then": "emacs-mcx.forwardWord" }, "await": "document selection" }, + "when": "kb-macro.recording && !config.emacs-mcx.cursorMoveOnFindWidget && editorFocus && findWidgetVisible && !replaceInputFocussed && !isComposing" }, + { "key": "alt+right", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.isearchExit", "args": { "then": "emacs-mcx.forwardWord" }, "await": "document selection" }, + "when": "kb-macro.recording && !config.emacs-mcx.cursorMoveOnFindWidget && editorFocus && findWidgetVisible && !replaceInputFocussed && !isComposing && !config.emacs-mcx.useMetaPrefixMacCmd" }, + { "key": "cmd+right", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.isearchExit", "args": { "then": "emacs-mcx.forwardWord" }, "await": "document selection" }, + "when": "kb-macro.recording && isMac && !config.emacs-mcx.cursorMoveOnFindWidget && editorFocus && findWidgetVisible && !replaceInputFocussed && !isComposing && config.emacs-mcx.useMetaPrefixMacCmd" }, + { "key": "alt+right", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.isearchExit", "args": { "then": "emacs-mcx.forwardWord" }, "await": "document selection" }, + "when": "kb-macro.recording && !isMac && !config.emacs-mcx.cursorMoveOnFindWidget && editorFocus && findWidgetVisible && !replaceInputFocussed && !isComposing && config.emacs-mcx.useMetaPrefixMacCmd" }, + { "key": "escape right", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.isearchExit", "args": { "then": "emacs-mcx.forwardWord" }, "await": "document selection" }, + "when": "kb-macro.recording && !config.emacs-mcx.cursorMoveOnFindWidget && editorFocus && findWidgetVisible && !replaceInputFocussed && !isComposing && config.emacs-mcx.useMetaPrefixEscape" }, + { "key": "ctrl+[ right", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.isearchExit", "args": { "then": "emacs-mcx.forwardWord" }, "await": "document selection" }, + "when": "kb-macro.recording && !config.emacs-mcx.cursorMoveOnFindWidget && editorFocus && findWidgetVisible && !replaceInputFocussed && !isComposing && config.emacs-mcx.useMetaPrefixCtrlLeftBracket" }, + { "key": "ctrl+left", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.backwardWord", "await": "selection" }, + "when": "kb-macro.recording && editorTextFocus" }, + { "key": "alt+left", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.backwardWord", "await": "selection" }, + "when": "kb-macro.recording && editorTextFocus && !config.emacs-mcx.useMetaPrefixMacCmd" }, + { "key": "cmd+left", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.backwardWord", "await": "selection" }, + "when": "kb-macro.recording && isMac && editorTextFocus && config.emacs-mcx.useMetaPrefixMacCmd" }, + { "key": "alt+left", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.backwardWord", "await": "selection" }, + "when": "kb-macro.recording && !isMac && editorTextFocus && config.emacs-mcx.useMetaPrefixMacCmd" }, + { "key": "escape left", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.backwardWord", "await": "selection" }, + "when": "kb-macro.recording && editorTextFocus && config.emacs-mcx.useMetaPrefixEscape" }, + { "key": "ctrl+[ left", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.backwardWord", "await": "selection" }, + "when": "kb-macro.recording && editorTextFocus && config.emacs-mcx.useMetaPrefixCtrlLeftBracket" }, + { "key": "ctrl+left", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.isearchExit", "args": { "then": "emacs-mcx.backwardWord" }, "await": "document selection" }, + "when": "kb-macro.recording && !config.emacs-mcx.cursorMoveOnFindWidget && editorFocus && findWidgetVisible && !replaceInputFocussed && !isComposing" }, + { "key": "alt+left", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.isearchExit", "args": { "then": "emacs-mcx.backwardWord" }, "await": "document selection" }, + "when": "kb-macro.recording && !config.emacs-mcx.cursorMoveOnFindWidget && editorFocus && findWidgetVisible && !replaceInputFocussed && !isComposing && !config.emacs-mcx.useMetaPrefixMacCmd" }, + { "key": "cmd+left", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.isearchExit", "args": { "then": "emacs-mcx.backwardWord" }, "await": "document selection" }, + "when": "kb-macro.recording && isMac && !config.emacs-mcx.cursorMoveOnFindWidget && editorFocus && findWidgetVisible && !replaceInputFocussed && !isComposing && config.emacs-mcx.useMetaPrefixMacCmd" }, + { "key": "alt+left", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.isearchExit", "args": { "then": "emacs-mcx.backwardWord" }, "await": "document selection" }, + "when": "kb-macro.recording && !isMac && !config.emacs-mcx.cursorMoveOnFindWidget && editorFocus && findWidgetVisible && !replaceInputFocussed && !isComposing && config.emacs-mcx.useMetaPrefixMacCmd" }, + { "key": "escape left", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.isearchExit", "args": { "then": "emacs-mcx.backwardWord" }, "await": "document selection" }, + "when": "kb-macro.recording && !config.emacs-mcx.cursorMoveOnFindWidget && editorFocus && findWidgetVisible && !replaceInputFocussed && !isComposing && config.emacs-mcx.useMetaPrefixEscape" }, + { "key": "ctrl+[ left", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.isearchExit", "args": { "then": "emacs-mcx.backwardWord" }, "await": "document selection" }, + "when": "kb-macro.recording && !config.emacs-mcx.cursorMoveOnFindWidget && editorFocus && findWidgetVisible && !replaceInputFocussed && !isComposing && config.emacs-mcx.useMetaPrefixCtrlLeftBracket" }, { "key": "alt+m", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.backToIndentation", "await": "selection" }, "when": "kb-macro.recording && editorTextFocus && !config.emacs-mcx.useMetaPrefixMacCmd" }, { "key": "cmd+m", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.backToIndentation", "await": "selection" }, @@ -619,6 +667,8 @@ "when": "kb-macro.recording && editorTextFocus && !suggestWidgetVisible && config.emacs-mcx.useMetaPrefixEscape" }, { "key": "ctrl+[ shift+[", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.backwardParagraph", "await": "selection" }, "when": "kb-macro.recording && editorTextFocus && !suggestWidgetVisible && config.emacs-mcx.useMetaPrefixCtrlLeftBracket" }, + { "key": "ctrl+up", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.backwardParagraph", "await": "selection" }, + "when": "kb-macro.recording && editorTextFocus && !suggestWidgetVisible" }, { "key": "alt+shift+]", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.forwardParagraph", "await": "selection" }, "when": "kb-macro.recording && editorTextFocus && !suggestWidgetVisible && !config.emacs-mcx.useMetaPrefixMacCmd" }, { "key": "cmd+shift+]", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.forwardParagraph", "await": "selection" }, @@ -629,6 +679,8 @@ "when": "kb-macro.recording && editorTextFocus && !suggestWidgetVisible && config.emacs-mcx.useMetaPrefixEscape" }, { "key": "ctrl+[ shift+]", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.forwardParagraph", "await": "selection" }, "when": "kb-macro.recording && editorTextFocus && !suggestWidgetVisible && config.emacs-mcx.useMetaPrefixCtrlLeftBracket" }, + { "key": "ctrl+down", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.forwardParagraph", "await": "selection" }, + "when": "kb-macro.recording && editorTextFocus && !suggestWidgetVisible" }, { "key": "alt+shift+.", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.endOfBuffer", "await": "selection" }, "when": "kb-macro.recording && editorTextFocus && !config.emacs-mcx.useMetaPrefixMacCmd" }, { "key": "cmd+shift+.", "command": "kb-macro.wrap", "args": { "command": "emacs-mcx.endOfBuffer", "await": "selection" }, From a39d0958a133966658bab9688b67e754b8bf55df Mon Sep 17 00:00:00 2001 From: tshino Date: Sat, 26 Nov 2022 00:03:46 +0900 Subject: [PATCH 2/3] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ddb8c5f..1c1e1697 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ All notable changes to the Keyboard Macro Bata extension will be documented in t ### [Unreleased] - Update - Updated keymap wrapper for Awesome Emacs Keymap (v0.46.0). [#162](https://github.com/tshino/vscode-kb-macro/pull/162) + - Updated keymap wrapper for Awesome Emacs Keymap (v0.47.0). [#165](https://github.com/tshino/vscode-kb-macro/pull/165) ### [0.12.8] - 2022-11-05 - Update From d9a5f2ceae7a60d10cb3e3a1188bea0b05211111 Mon Sep 17 00:00:00 2001 From: tshino Date: Sat, 26 Nov 2022 00:06:37 +0900 Subject: [PATCH 3/3] Update README --- keymap-wrapper/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keymap-wrapper/README.md b/keymap-wrapper/README.md index 4ba7344b..80c54207 100644 --- 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) | 2022-04-05 | `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) | 2022-11-25 | `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) | 2022-11-26 | `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) | 2022-10-09 | `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) | 2021-12-26 | `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) | 2021-12-21 | `Ctrl/Cmd+Q` | `Ctrl/Cmd+Q` | `Ctrl/Cmd+Shift+Q` |