[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/ergoemacs-mode ea88aad 247/325: Add back the command lo
From: |
Stefan Monnier |
Subject: |
[elpa] externals/ergoemacs-mode ea88aad 247/325: Add back the command loop |
Date: |
Sat, 23 Oct 2021 18:49:03 -0400 (EDT) |
branch: externals/ergoemacs-mode
commit ea88aad60bd2ad3610c7606c06c7af3dadc397d1
Author: Matthew Fidler <514778+mattfidler@users.noreply.github.com>
Commit: Matthew Fidler <514778+mattfidler@users.noreply.github.com>
Add back the command loop
---
ergoemacs-mode.el | 3 +++
ergoemacs-themes.el | 8 ++++----
ergoemacs-translate.el | 4 ++--
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/ergoemacs-mode.el b/ergoemacs-mode.el
index eb27b2e..eb99b6c 100644
--- a/ergoemacs-mode.el
+++ b/ergoemacs-mode.el
@@ -137,6 +137,9 @@ Added beginning-of-buffer Alt+n (QWERTY notation) and
end-of-buffer Alt+Shift+n"
(defvar ergoemacs-keymap (make-sparse-keymap)
"ErgoEmacs minor mode keymap. This replaces `global-map'.")
+(defvar ergoemacs-translate--parent-map (make-sparse-keymap)
+ "Parent keymap for sparse translation")
+
(defvar ergoemacs-saved-global-map nil
"Saved global map.")
diff --git a/ergoemacs-themes.el b/ergoemacs-themes.el
index 3ee0f02..2a9311b 100644
--- a/ergoemacs-themes.el
+++ b/ergoemacs-themes.el
@@ -1329,10 +1329,10 @@ keys (e.g. M-O A == <up>) or regular M-O keybinding."
(ergoemacs-define-key ergoemacs-override-keymap (kbd "<menu> n t")
'org-capture)
(ergoemacs-define-key ergoemacs-override-keymap (kbd "<menu> n C-t")
'org-agenda)
(ergoemacs-define-key ergoemacs-override-keymap (kbd "<menu> n T")
'org-agenda)
- ;(define-key ergoemacs-translate--parent-map [f2]
'ergoemacs-command-loop--force-universal-argument)
- ;(define-key ergoemacs-translate--parent-map (kbd "DEL")
'ergoemacs-command-loop--force-undo-last))
- ;(define-key ergoemacs-translate--parent-map (if (eq system-type
'windows-nt) [apps] [menu])
- ; 'ergoemacs-command-loop--swap-translation)
+ (define-key ergoemacs-translate--parent-map [f2]
'ergoemacs-command-loop--force-universal-argument)
+ (define-key ergoemacs-translate--parent-map (kbd "DEL")
'ergoemacs-command-loop--force-undo-last)
+ (define-key ergoemacs-translate--parent-map (if (eq system-type
'windows-nt) [apps] [menu])
+ 'ergoemacs-command-loop--swap-translation)
)
(defun ergoemacs-install-standard-theme ()
diff --git a/ergoemacs-translate.el b/ergoemacs-translate.el
index 0770c0a..86ed830 100644
--- a/ergoemacs-translate.el
+++ b/ergoemacs-translate.el
@@ -907,7 +907,7 @@ If there are no gui elements, return nil."
(push elt new-mod)))
(ergoemacs-translate--event-convert-list `(,@new-mod
,last-basic-event))))))
-(defvar ergoemacs-translate--parent-map nil
+(defvar ergoemacs-translate--parent-map (make-sparse-keymap)
"Parent map for keymaps when completing a key sequence.")
(defun ergoemacs-translate--parent-map ()
@@ -963,7 +963,7 @@ This takes into consideration the modal state of
`ergoemacs-mode'."
(setq keymap (ergoemacs-translation-struct-keymap-modal translation)
ret keymap)
(setq keymap (ergoemacs-translation-struct-keymap translation)
- ret (make-composed-keymap (ergoemacs keymap) (ergoemacs
ergoemacs-translate--parent-map))))
+ ret (make-composed-keymap keymap
ergoemacs-translate--parent-map)))
(puthash key ret ergoemacs-translate--keymap-hash))
ret))
- [elpa] externals/ergoemacs-mode 57e8e17 257/325: remove undo-tree and mark-active, (continued)
- [elpa] externals/ergoemacs-mode 57e8e17 257/325: remove undo-tree and mark-active, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode edc154f 272/325: Add theme for the ergoemacs keys hash. Also reduce tests, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 09bc371 278/325: Restore menu items after turning off ergoemacs, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode f14b71e 281/325: Remove ergoemacs-mode support for term-mode, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode f3ebfc1 298/325: Add input-pending-p to echoing of commands, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 349d05a 300/325: Remove describe theme, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 00e00a6 230/325: Remove ergoemacs-component-struct, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 37fc1c8 233/325: Remove ergoemacs-theme-component--parse, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 6f703fe 235/325: Remove ergoemacs-advice, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode d0004ec 241/325: Remove more -map functions, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode ea88aad 247/325: Add back the command loop,
Stefan Monnier <=
- [elpa] externals/ergoemacs-mode d43bb0a 248/325: Fix command loop, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 87b722e 251/325: Make calculate ergoemacs bindings an interactive function, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 4c1fe49 252/325: Fix some issues, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode b7f909a 254/325: Some fixes, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode f28dc66 255/325: Add some active keymaps to ergoemacs-mode (like before), Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode ecb9ac7 256/325: Align some more of the keys with what was there before. Add redo, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 9e58dd5 261/325: Simplify, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode b4b14f2 260/325: Remove ergoemacs-component, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode bde293e 263/325: Drop cache and hashkey, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 4250fae 267/325: Remove more outdated keys, Stefan Monnier, 2021/10/23