[elpa] externals/ergoemacs-mode ea88aad 247/325: Add back the command loop

[Stefan Monnier]

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))