[elpa] 12/35: Possibly Fix Issue #269

[Matthew Fidler]

mlf176f2 pushed a commit to branch externals/ergoemacs-mode
in repository elpa.

commit 59a829d8ea72221c93e35b13570b91b55bf51863
Author: Matthew L. Fidler <address@hidden>
Date:   Mon Jul 7 13:45:04 2014 -0500

    Possibly Fix Issue #269
---
 ergoemacs-theme-engine.el |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ergoemacs-theme-engine.el b/ergoemacs-theme-engine.el
index ec3d83d..b04beae 100644
--- a/ergoemacs-theme-engine.el
+++ b/ergoemacs-theme-engine.el
@@ -1793,7 +1793,7 @@ COMPONENT can be defined as component::version"
 
 (defun ergoemacs-theme-get-obj (&optional theme version)
   "Get the VERSION of THEME from `ergoemacs-theme-get-component' and 
`ergoemacs-theme-components'"
-  (ergoemacs-theme-get-component (ergoemacs-theme-components (or theme 
ergoemacs-theme)) version (or theme ergoemacs-theme)))
+  (ergoemacs-theme-get-component (ergoemacs-theme-components (or theme 
ergoemacs-theme "standard")) version (or theme ergoemacs-theme "standard")))
 
 (defun ergoemacs-keymap-empty-p (keymap &optional dont-collapse)
   "Determines if the KEYMAP is an empty keymap.
@@ -1825,7 +1825,7 @@ DONT-COLLAPSE doesn't collapse empty keymaps"
   "Current `ergoemacs-mode' theme object")
 (defun ergoemacs-theme-install (&optional theme  version)
   "Gets the keymaps for THEME for VERSION."
-  (setq ergoemacs-theme--object (ergoemacs-theme-get-obj (or theme 
ergoemacs-theme) (or version (ergoemacs-theme-get-version))))
+  (setq ergoemacs-theme--object (ergoemacs-theme-get-obj (or theme 
ergoemacs-theme "standard") (or version (ergoemacs-theme-get-version))))
   (ergoemacs-theme-obj-install ergoemacs-theme--object))
 
 (defun ergoemacs-apply-inits (&rest ignore)
@@ -1926,7 +1926,7 @@ DONT-COLLAPSE doesn't collapse empty keymaps"
 (defun ergoemacs-theme-components (&optional theme)
   "Get a list of components used for the current theme.
 This respects `ergoemacs-theme-options'."
-  (let* ((theme (or theme ergoemacs-theme))
+  (let* ((theme (or theme ergoemacs-theme "standard"))
          (theme-plist (gethash (if (stringp theme) theme
                                  (symbol-name theme))
                                ergoemacs-theme-hash))