[elpa] externals/ergoemacs-mode 78e8d55 85/87: Fix regression with #503

[Stefan Monnier]

branch: externals/ergoemacs-mode
commit 78e8d55cf9c1e7287b869a66c500ff403199e92a
Author: Matthew Fidler <514778+mattfidler@users.noreply.github.com>
Commit: Matthew Fidler <514778+mattfidler@users.noreply.github.com>

    Fix regression with #503
---
 ergoemacs-command-loop.el | 4 ++--
 ergoemacs-translate.el    | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ergoemacs-command-loop.el b/ergoemacs-command-loop.el
index 3213c8e..2ec495f 100644
--- a/ergoemacs-command-loop.el
+++ b/ergoemacs-command-loop.el
@@ -376,7 +376,7 @@ Ergoemacs-mode sets up: :ctl-to-alt :unchorded :normal."
                (next-key-is-control-meta (control meta))
                (next-key-is-meta-control (control meta))
                (next-key-is-quoted nil)))
-  (eval (macroexpand-all
+  (eval (macroexpand-all    ;FIXME: Why macroexpand-all?
          `(progn
             (defun ,(intern (concat "ergoemacs-command-loop--" (symbol-name 
(nth 0 arg)))) ()
               ,(format "Ergoemacs function to allow %s to be the emacs 
modifiers" (nth 1 arg))
@@ -1656,7 +1656,7 @@ instead of `format'."
       (when (eq ergoemacs-message-level 
ergoemacs-command-loop--spinner-display)      
        (let* ((string (or (and (listp string)
                                (eq (car string) 'quote)
-                               (eval string))
+                               (cadr string))
                           string))
               (rest (or (and (listp string)
                              (concat " " (apply #'format (apply 
#'ergoemacs-key-description--unicode-char string) args)))
diff --git a/ergoemacs-translate.el b/ergoemacs-translate.el
index cbb1dc6..d4fcc1e 100644
--- a/ergoemacs-translate.el
+++ b/ergoemacs-translate.el
@@ -751,8 +751,9 @@ When NAME is a symbol, setup the translation function for 
the symbol."
             ,(concat "Ergoemacs local map for translation :"
                      name-str
                      " while completing a key sequence."))
-          (define-obsolete-variable-alias ',(intern (concat "ergoemacs-" 
name-str "-translation-local-map") "Ergoemacs-v5.16")
-             ',(intern (concat "ergoemacs-translate--" name-str "-map"))))))
+          (define-obsolete-variable-alias ',(intern (concat "ergoemacs-" 
name-str "-translation-local-map"))
+             ',(intern (concat "ergoemacs-translate--" name-str "-map"))
+            "Ergoemacs-v5.16"))))
       (ergoemacs-map-properties--label-map (intern (concat 
"ergoemacs-translate--" name-str "-map")) t)
       (ergoemacs (symbol-value (intern (concat "ergoemacs-translate--" 
name-str "-map"))) :only-local-modifications-p t)
       ;;