[elpa] externals/ergoemacs-mode b0c649d 052/325: Cleanup

[Stefan Monnier]

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

    Cleanup
---
 ergoemacs-component.el |  2 +-
 ergoemacs-functions.el |  4 ++--
 ergoemacs-layouts.el   | 14 +++++---------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/ergoemacs-component.el b/ergoemacs-component.el
index db328d5..6519dfd 100644
--- a/ergoemacs-component.el
+++ b/ergoemacs-component.el
@@ -1013,7 +1013,7 @@ to prevent infinite recursion."
   (when (eq ergoemacs-component-struct--refresh-variables t)
     (setq ergoemacs-component-struct--refresh-variables 
ergoemacs-component-struct--applied-inits))
   (let* ((obj (or obj (ergoemacs-theme-components)))
-         package-name defer comp tmp autoloads)
+         tmp)
     (when ergoemacs-component-struct--apply-inits-first-p
       (setq ergoemacs-component-struct--apply-inits-first-p nil)
       (if (not ergoemacs-mode--fast-p)
diff --git a/ergoemacs-functions.el b/ergoemacs-functions.el
index df106c8..0f8888c 100644
--- a/ergoemacs-functions.el
+++ b/ergoemacs-functions.el
@@ -340,8 +340,8 @@ If TERMINAL is non-nil, run the terminal version"
 
 (defun ergoemacs-emacs-exe ()
   "Get the Emacs executable for testing purposes."
-  (let* ((emacs-exe (invocation-name))
-         (emacs-dir (invocation-directory))
+  (let* ((emacs-exe invocation-name)
+         (emacs-dir invocation-directory)
          (full-exe (concat "\"" (expand-file-name emacs-exe emacs-dir)
                            "\"")))
     full-exe))
diff --git a/ergoemacs-layouts.el b/ergoemacs-layouts.el
index dc3f913..2049b9b 100644
--- a/ergoemacs-layouts.el
+++ b/ergoemacs-layouts.el
@@ -69,6 +69,7 @@
 
 ;; From Baptiste Fouques
 ;; changed to bepo because it breaks how I run things (unfortunately)...
+(defvaralias 'ergoemacs-layout-bépo 'ergoemacs-layout-bepo)
 (defvar ergoemacs-layout-bepo
   '("" "$" "\"" "«" "»" "(" ")" "@" "+" "-" "/" "*" "=" "%" ""
     "" ""  "b" "é" "p" "o" "è" "^" "v" "d" "l" "j" "z" "w" ""
@@ -95,8 +96,6 @@
     "" ">"  "W" "X" "C" "V" "B" "N" "?" "." "/" "+" "" "" "")
   "Belgian AZERTY.")
 
-(defvaralias 'ergoemacs-layout-bépo 'ergoemacs-layout-bepo)
-
 (defvar ergoemacs-layout-colemak
   '("" "`" "1" "2" "3" "4" "5" "6" "7" "8" "9" "0" "-" "=" ""
     "" ""  "q" "w" "f" "p" "g" "j" "l" "u" "y" ";" "[" "]" "\\"
@@ -122,6 +121,7 @@
   "Danish layout.")
 
 ;; From Thomas Rikl
+(defvaralias 'ergoemacs-layout-ge 'ergoemacs-layout-de)
 (defvar ergoemacs-layout-de
   '("" "" "1" "2" "3" "4" "5" "6" "7" "8" "9" "0" "ß" "" ""
     "" ""  "q" "w" "e" "r" "t" "z" "u" "i" "o" "p" "ü" "+" ""
@@ -146,6 +146,7 @@
     "" "" "K" "Y" "Ö" "Ä" "Q" "J" "G" "W" "V" "Z" "" "" "")
   "German BU-TECK Layout.  URL `http://www.adnw.de'.")
 
+(defvaralias 'ergoemacs-layout-us_dvorak 'ergoemacs-layout-dv)
 (defvar ergoemacs-layout-dv
   '("" "`" "1" "2" "3" "4" "5" "6" "7" "8" "9" "0" "[" "]" ""
     "" ""  "'" "," "." "p" "y" "f" "g" "c" "r" "l" "/" "=" "\\"
@@ -182,6 +183,7 @@
     "" ""  "Z" "Ĉ" "C" "V" "B" "N" "M" ";" ":" "?" "" "" "")
   "Esperanto (displaced semicolon and quote, obsolete) layout.")
 
+(defvaralias 'ergoemacs-layout-sp 'ergoemacs-layout-es)
 (defvar ergoemacs-layout-es
   '("" "°" "1" "2" "3" "4" "5" "6" "7" "8" "9" "0" "'" "¡" ""
     "" ""  "q" "w" "e" "r" "t" "y" "u" "i" "o" "p" "`" "+" ""
@@ -255,8 +257,6 @@
     "" "|"  ":" "Q" "J" "K" "X" "B" "M" "W" "V" "Z" "" "" "")
   "UK Dvorak layout.")
 
-(defvaralias 'ergoemacs-layout-ge 'ergoemacs-layout-de)
-
 (defvar ergoemacs-layout-it
   '("" "\\" "1" "2" "3" "4" "5" "6" "7" "8" "9" "0" "'" "¡" ""
     "" ""  "q" "w" "e" "r" "t" "y" "u" "i" "o" "p" "è" "+" ""
@@ -317,8 +317,6 @@
     "" "»"  "Y" "Ç" "J" "B" "K" "Q" "V" "G" "F" "Z" "" "" "")
   "PT Nativo layout URL 
`http://xahlee.info/kbd/pt-nativo_keyboard_layout.html'.")
 
-(defvaralias 'ergoemacs-layout-sp 'ergoemacs-layout-es)
-
 (defvar ergoemacs-layout-sw
   '("" "½" "1" "2" "3" "4" "5" "6" "7" "8" "9" "0" "+" "’" ""
     "" ""  "q" "w" "e" "r" "t" "y" "u" "i" "o" "p" "å" "\"" ""
@@ -343,8 +341,6 @@
     "" ""  "Z" "X" "C" "V" "B" "N" "M" "<" ">" "?" "" "" "")
   "US English QWERTY layout.")
 
-(defvaralias 'ergoemacs-layout-us_dvorak 'ergoemacs-layout-dv)
-
 (defvar ergoemacs-layout-workman
   '("" "`" "1" "2" "3" "4" "5" "6" "7" "8" "9" "0" "-" "=" ""
     "" ""  "q" "d" "r" "w" "b" "j" "f" "u" "p" ";" "[" "]" "\\"
@@ -369,6 +365,7 @@
     "" ""  "Z" "X" "M" "C" "V" "K" "L" "<" ">" "?" "" "" "")
   "US Workman layout.  URL `http://www.workmanlayout.com/blog/'.")
 
+(defvaralias 'ergoemacs-layout-jcuken 'ergoemacs-layout-ru)
 (defvar ergoemacs-layout-ru
   '("" "" "1" "2" "3" "4" "5" "6" "7" "8" "9" "0" "-" "=" "\\"
     "" ""  "й" "ц" "у" "к" "е" "н" "г" "ш" "щ" "з" "х" "ъ" "" 
@@ -381,7 +378,6 @@
     "" "" "Я" "Ч" "С" "М" "И" "Т" "Ь" "Б" "Ю" "," "" "" "")
   "Russian/Cryllic jcuken layout.")
 
-(defvaralias 'ergoemacs-layout-jcuken 'ergoemacs-layout-ru)
 
 (require 'help-mode)
 (defvar quail-keyboard-layout-alist)