[elpa] externals/ergoemacs-mode 3729fbd 055/325: Cleanup

[Stefan Monnier]

branch: externals/ergoemacs-mode
commit 3729fbdf5a64b11b4f95d46cf49d738d239de2c6
Author: Walter Landry <wlandry@caltech.edu>
Commit: Walter Landry <wlandry@caltech.edu>

    Cleanup
---
 ergoemacs-mode.el         | 30 ++++++++++--------------------
 ergoemacs-theme-engine.el |  2 +-
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/ergoemacs-mode.el b/ergoemacs-mode.el
index 2cf2622..cc3b9a5 100644
--- a/ergoemacs-mode.el
+++ b/ergoemacs-mode.el
@@ -156,6 +156,7 @@ Added beginning-of-buffer Alt+n (QWERTY notation) and 
end-of-buffer Alt+Shift+n"
 
 (defcustom ergoemacs-keyboard-mirror nil
   "Specifies which keyboard layout to mirror."
+  :type 'sexp
   :set #'ergoemacs-set-default
   :initialize #'custom-initialize-default
   :group 'ergoemacs-mode)
@@ -816,6 +817,7 @@ Valid values are:
   "Display Options for `ergoemacs-mode'."
   :group 'ergoemacs-mode)
 
+(define-obsolete-variable-alias 'ergoemacs-use-unicode-char 
'ergoemacs-display-unicode-characters)
 (defcustom ergoemacs-display-unicode-characters t
   "Use unicode characters when available."
   :type 'boolean
@@ -823,8 +825,7 @@ Valid values are:
   :initialize #'custom-initialize-default
   :group 'ergoemacs-display)
 
-(define-obsolete-variable-alias 'ergoemacs-use-unicode-char 
'ergoemacs-display-unicode-characters)
-
+(define-obsolete-variable-alias 'ergoemacs-use-ergoemacs-key-descriptions 
'ergoemacs-display-ergoemacs-key-descriptions)
 (defcustom ergoemacs-display-ergoemacs-key-descriptions t
   "Use ergoemacs key descriptions (Alt+)."
   :type 'boolean
@@ -832,9 +833,8 @@ Valid values are:
   :initialize #'custom-initialize-default
   :group 'ergoemacs-display)
 
-(define-obsolete-variable-alias 'ergoemacs-use-ergoemacs-key-descriptions 
'ergoemacs-display-ergoemacs-key-descriptions)
-
 
+(define-obsolete-variable-alias 'ergoemacs-use-unicode-brackets 
'ergoemacs-display-use-unicode-brackets-around-keys)
 (defcustom ergoemacs-display-use-unicode-brackets-around-keys t
   "Use unicode brackets."
   :type 'boolean
@@ -842,9 +842,7 @@ Valid values are:
   :initialize #'custom-initialize-default
   :group 'ergoemacs-display)
 
-(define-obsolete-variable-alias 'ergoemacs-use-unicode-brackets 
'ergoemacs-display-use-unicode-brackets-around-keys)
-
-
+(define-obsolete-variable-alias 'ergoemacs-use-small-symbols 
'ergoemacs-display-small-symbols-for-key-modifiers)
 (defcustom ergoemacs-display-small-symbols-for-key-modifiers nil
   "Use small symbols to represent alt+ ctl+ on windows/linux."
   :type 'boolean
@@ -852,8 +850,7 @@ Valid values are:
   :initialize #'custom-initialize-default
   :group 'ergoemacs-display)
 
-(define-obsolete-variable-alias 'ergoemacs-use-small-symbols 
'ergoemacs-display-small-symbols-for-key-modifiers)
-
+(define-obsolete-variable-alias 'ergoemacs-capitalize-keys 
'ergoemacs-display-capitalize-keys)
 (defcustom ergoemacs-display-capitalize-keys 'with-modifiers
   "Capitalize keys like Ctrl+C.
 `ergoemacs-mode' should show Ctrl+Shift+C if you are pressing these keys."
@@ -865,8 +862,7 @@ Valid values are:
   :initialize #'custom-initialize-default
   :group 'ergoemacs-display)
 
-(define-obsolete-variable-alias 'ergoemacs-capitalize-keys 
'ergoemacs-display-capitalize-keys)
-
+(define-obsolete-variable-alias 'ergoemacs-pretty-key-use-face 
'ergoemacs-display-key-use-face-p)
 (defcustom ergoemacs-display-key-use-face-p t
   "Use a button face for keys."
   :type 'boolean
@@ -874,9 +870,6 @@ Valid values are:
   :initialize #'custom-initialize-default
   :group 'ergoemacs-display)
 
-(define-obsolete-variable-alias 'ergoemacs-pretty-key-use-face 
'ergoemacs-display-key-use-face-p)
-
-
 (defface ergoemacs-display-key-face
   '((t :inverse-video t :box (:line-width 1 :style released-button) :weight 
bold))
   "Button Face for an `ergoemacs-mode' pretty key."
@@ -933,13 +926,13 @@ Valid values are:
           (const :tag "No cursor" nil))
   :group 'ergoemacs-command-loop)
 
+(define-obsolete-variable-alias 'ergoemacs-read-blink-timeout 
'ergoemacs-command-loop-blink-rate)
 (defcustom ergoemacs-command-loop-blink-rate 0.4
   "Rate that the ergoemacs-command loop cursor blinks."
   :type 'number
   :group 'ergoemacs-command-loop)
 
-(define-obsolete-variable-alias 'ergoemacs-read-blink-timeout 
'ergoemacs-command-loop-blink-rate)
-
+(define-obsolete-variable-alias 'ergoemacs-read-swaps 
'ergoemacs-command-loop-swap-translation)
 (defcustom ergoemacs-command-loop-swap-translation
   '(((:normal :normal) :unchorded-ctl)
     ((:normal :unchorded-ctl) :ctl-to-alt)
@@ -957,8 +950,6 @@ Valid values are:
            (sexp :tag "Translated Type")))
   :group 'ergoemacs-command-loop)
 
-(define-obsolete-variable-alias 'ergoemacs-read-swaps 
'ergoemacs-command-loop-swap-translation)
-
 (defcustom ergoemacs-command-loop-type nil
   "Type of `ergoemacs-mode' command loop."
   :type '(choice
@@ -993,6 +984,7 @@ Valid values are:
   :group 'ergoemacs-command-loop)
 
 
+(define-obsolete-variable-alias 'ergoemacs-default-cursor 
'ergoemacs-default-cursor-color)
 (defcustom ergoemacs-default-cursor-color nil
   "Default cursor color.
 
@@ -1003,8 +995,6 @@ color.  Otherwise this will be nil A color string as 
passed to
                  (color :tag "Color"))
   :group 'ergoemacs-modal)
 
-(define-obsolete-variable-alias 'ergoemacs-default-cursor 
'ergoemacs-default-cursor-color)
-
 (defvar ergoemacs-translate--translation-hash)
 
 (defcustom ergoemacs-translate-keys nil
diff --git a/ergoemacs-theme-engine.el b/ergoemacs-theme-engine.el
index 6e3a6ba..9aa329c 100644
--- a/ergoemacs-theme-engine.el
+++ b/ergoemacs-theme-engine.el
@@ -640,7 +640,7 @@ See also `find-function-recenter-line' and 
`find-function-after-hook'."
 # should be like ErgoEmacs.
 # If none of the keys work, try replacing all instances of \\e with \\M-.
 # That's means changing Esc to Meta key.
-\nset editing-mode emacs") tmp)
+\nset editing-mode emacs"))
     (with-temp-buffer
       (dolist (cmds ergoemacs-theme-create-bash-functions)
         (dolist (cmd cmds)