[elpa] externals/ergoemacs-mode f4e9a52 104/325: Remove more ergoemacs-theme

[Stefan Monnier]

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

    Remove more ergoemacs-theme
---
 ergoemacs-functions.el    | 5 +----
 ergoemacs-lib.el          | 2 --
 ergoemacs-map.el          | 1 -
 ergoemacs-mode.el         | 5 ++---
 ergoemacs-theme-engine.el | 8 ++------
 ergoemacs-translate.el    | 6 ++----
 6 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/ergoemacs-functions.el b/ergoemacs-functions.el
index 0f8888c..e495f01 100644
--- a/ergoemacs-functions.el
+++ b/ergoemacs-functions.el
@@ -42,7 +42,6 @@
 (defvar ergoemacs-keyboard-layout)
 (defvar ergoemacs-mode)
 (defvar ergoemacs-single-command-keys)
-(defvar ergoemacs-theme)
 (defvar helm-buffer)
 (defvar helm-ff-default-directory)
 (defvar helm-ff-last-expanded)
@@ -265,8 +264,6 @@ The PROCESS is the process where the clean environment is 
run."
         cmd process rm-batch)
     (when ergoemacs-keyboard-layout
       (setenv "ERGOEMACS_KEYBOARD_LAYOUT" ergoemacs-keyboard-layout))
-    (when ergoemacs-theme
-      (setenv "ERGOEMACS_THEME" ergoemacs-theme))
     (cond
      ((with-current-buffer (get-buffer-create "*ergoemacs-clean*")
         (not ergoemacs-terminal))
@@ -2669,7 +2666,7 @@ With a prefix argument like \\[universial-argument] in an
 (defun ergoemacs-describe-current-theme ()
   "Describe the current theme."
   (interactive)
-  (ergoemacs-theme-describe (or ergoemacs-theme "standard")))
+  (ergoemacs-theme-describe "standard"))
 
 ;; Ergoemacs Test suite
 (unless (fboundp 'ergoemacs-test)
diff --git a/ergoemacs-lib.el b/ergoemacs-lib.el
index 75688d6..1c585d9 100644
--- a/ergoemacs-lib.el
+++ b/ergoemacs-lib.el
@@ -35,7 +35,6 @@
 (defvar mode-icons-read-only-space)
 (defvar mode-icons-cached-mode-name)
 (defvar mode-icons-eol-text)
-(defvar ergoemacs-theme)
 (defvar ergoemacs-excluded-major-modes)
 (defvar ergoemacs-keyboard-layout)
 (defvar ergoemacs-keymap)
@@ -509,7 +508,6 @@ The reset is done with `ergoemacs-mode-reset'."
   (if (called-interactively-p 'any)
       (progn
        (setenv "ERGOEMACS_KEYBOARD_LAYOUT" ergoemacs-keyboard-layout)
-       (setenv "ERGOEMACS_THEME" ergoemacs-theme)
         (shell-command (format "%s -Q --batch -l %s/ergoemacs-mode --eval 
\"(ergoemacs-gen-ahk %s)\" &"
                                (ergoemacs-emacs-exe)
                                ergoemacs-dir (if current-prefix-arg "t" 
"nil"))))
diff --git a/ergoemacs-map.el b/ergoemacs-map.el
index 24f560a..ff13ee1 100644
--- a/ergoemacs-map.el
+++ b/ergoemacs-map.el
@@ -53,7 +53,6 @@
 (defvar ergoemacs-mode)
 (defvar ergoemacs-modify-transient-maps)
 (defvar ergoemacs-saved-global-map)
-(defvar ergoemacs-theme)
 (defvar ergoemacs-translation-hash)
 (defvar ergoemacs-user-keymap)
 (defvar ess-language)
diff --git a/ergoemacs-mode.el b/ergoemacs-mode.el
index 7e720ce..c537632 100644
--- a/ergoemacs-mode.el
+++ b/ergoemacs-mode.el
@@ -301,9 +301,8 @@ The `execute-extended-command' is now 
\\[execute-extended-command].
                         (setq ergoemacs-require--ini-p t)
                        (ergoemacs-setup-override-keymap)                       
                         (if refresh-p
-                            (message "Ergoemacs-mode keys refreshed (%s:%s)"
-                                     ergoemacs-keyboard-layout (or 
ergoemacs-theme "standard"))
-                          (message "Ergoemacs-mode turned ON (%s:%s)." 
ergoemacs-keyboard-layout (or ergoemacs-theme "standard"))))
+                            (message "Ergoemacs-mode keys refreshed (%s)" 
ergoemacs-keyboard-layout)
+                          (message "Ergoemacs-mode turned ON (%s)." 
ergoemacs-keyboard-layout)))
 
                     (modify-all-frames-parameters 
ergoemacs-mode--default-frame-alist)
                     (unless (assoc 'cursor-type 
ergoemacs-mode--default-frame-alist)
diff --git a/ergoemacs-theme-engine.el b/ergoemacs-theme-engine.el
index 8f613f8..2c6ef2f 100644
--- a/ergoemacs-theme-engine.el
+++ b/ergoemacs-theme-engine.el
@@ -531,10 +531,8 @@ See also `find-function-recenter-line' and 
`find-function-after-hook'."
               (ergoemacs-key-description--keymap ergoemacs-keymap t)
             (unwind-protect
                 (progn
-                  (setq ergoemacs-theme theme)
                   (ergoemacs-mode-reset)
                   (ergoemacs-key-description--keymap ergoemacs-keymap t))
-              (setq ergoemacs-theme old-theme)
               (ergoemacs-mode-reset)))
           (buffer-string))))))
 
@@ -839,8 +837,7 @@ See also `find-function-recenter-line' and 
`find-function-after-hook'."
             ret)
         (unless (and (equal theme old-theme)
                      (equal lay old-layout))
-          (setq ergoemacs-theme theme
-                ergoemacs-keyboard-layout lay)
+          (setq ergoemacs-keyboard-layout lay)
           (ergoemacs-mode-reset))
         (unwind-protect
             (progn
@@ -954,8 +951,7 @@ See also `find-function-recenter-line' and 
`find-function-after-hook'."
                 (push file-name ret)))
           (unless (and (equal theme old-theme)
                        (equal lay old-layout))
-            (setq ergoemacs-theme old-theme
-                  ergoemacs-keyboard-layout old-layout)
+            (setq ergoemacs-keyboard-layout old-layout)
             (ergoemacs-mode-reset)))
         ret))))
 
diff --git a/ergoemacs-translate.el b/ergoemacs-translate.el
index a1cde13..6019f90 100644
--- a/ergoemacs-translate.el
+++ b/ergoemacs-translate.el
@@ -1097,15 +1097,13 @@ If there are no gui elements, retun nil."
                     (dolist (lay layouts)
                       (dolist (theme themes)
                         (message "Getting information from %s-%s" lay theme)
-                        (setq ergoemacs-keyboard-layout lay
-                              ergoemacs-theme theme)
+                        (setq ergoemacs-keyboard-layout lay)
                         (ergoemacs-mode-reset)
                         (insert "[" lay "-" theme "]"
                                 (ergoemacs-translate--ahk-functions-ini)
                                 "\n")))
                     (buffer-string)))
-      (setq ergoemacs-keyboard-layout original-layout
-            ergoemacs-theme original-theme)
+      (setq ergoemacs-keyboard-layout original-layout)
       (ergoemacs-mode-reset))
     ret))