branch: externals/ergoemacs-mode
commit 051a0c979a2931fdeb1c04cf9e3637ec19039018
Author: Walter Landry <wlan...@caltech.edu>
Commit: Walter Landry <wlan...@caltech.edu>
Hard code more theme==standard
---
ergoemacs-map.el | 2 +-
ergoemacs-theme-engine.el | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ergoemacs-map.el b/ergoemacs-map.el
index ff13ee1..258fdb0 100644
--- a/ergoemacs-map.el
+++ b/ergoemacs-map.el
@@ -1065,7 +1065,7 @@ When INI is non-nil, add conditional maps to
`minor-mode-map-alist'."
(ergoemacs-map--hashkey)
(ergoemacs-mode-line)
(define-key ergoemacs-menu-keymap [menu-bar ergoemacs-mode]
- `("ErgoEmacs" . ,(ergoemacs-theme--menu (ergoemacs :current-theme))))
+ `("ErgoEmacs" . ,(ergoemacs-theme--menu)))
(let ((x (assq 'ergoemacs-mode minor-mode-map-alist)))
(while x
diff --git a/ergoemacs-theme-engine.el b/ergoemacs-theme-engine.el
index 2c6ef2f..2986b0c 100644
--- a/ergoemacs-theme-engine.el
+++ b/ergoemacs-theme-engine.el
@@ -219,9 +219,9 @@ When AT-END is non-nil, append a $ to the regular
expression."
(member (list option 'on) ergoemacs-theme-options)))))
-(defun ergoemacs-theme--menu-options (theme)
+(defun ergoemacs-theme--menu-options ()
"Gets the options menu for THEME."
- (let ((plist (ergoemacs-gethash theme ergoemacs-theme-hash))
+ (let ((plist (ergoemacs-gethash "standard" ergoemacs-theme-hash))
(menu-list '())
(menu-pre '())
(options-on '())
@@ -288,11 +288,11 @@ When AT-END is non-nil, append a $ to the regular
expression."
(if (not theme-ver) nil
(car (cdr theme-ver)))))
-(defun ergoemacs-theme--menu (theme)
+(defun ergoemacs-theme--menu ()
"Define menus for current THEME."
`(keymap
,(ergoemacs-layouts--menu)
- ,(ergoemacs-theme--menu-options theme)
+ ,(ergoemacs-theme--menu-options)
(c-v
menu-item "Paste behavior"
(keymap
