[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/ergoemacs-mode 051a0c9 110/325: Hard code more theme==s
From: |
Stefan Monnier |
Subject: |
[elpa] externals/ergoemacs-mode 051a0c9 110/325: Hard code more theme==standard |
Date: |
Sat, 23 Oct 2021 18:48:32 -0400 (EDT) |
branch: externals/ergoemacs-mode
commit 051a0c979a2931fdeb1c04cf9e3637ec19039018
Author: Walter Landry <wlandry@caltech.edu>
Commit: Walter Landry <wlandry@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
- [elpa] externals/ergoemacs-mode b2a8bb7 099/325: Make 'compile' the default make target, (continued)
- [elpa] externals/ergoemacs-mode b2a8bb7 099/325: Make 'compile' the default make target, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 18b3859 121/325: Simplify split-window binding, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode b378df1 105/325: Reindent, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode c973446 124/325: Remove redundant fixed-newline, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode cbfa5a9 115/325: Remove some now obsolete <apps> tests, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 1bd971e 137/325: Remove iswitchb bindings and misc cleanup, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 377d498 107/325: Set variables properly. Lots of duplication., Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode c09952e 125/325: Remove all C-h help bindings except ergoemacs-describe-current-theme, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode da06d4f 112/325: Fix more warnings. Remove compatibility with <25.1., Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 9ef7b6d 120/325: Add newlines to scratch message, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 051a0c9 110/325: Hard code more theme==standard,
Stefan Monnier <=
- [elpa] externals/ergoemacs-mode 1d4ddc3 114/325: Remove M-y bindings for search., Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 766cb61 129/325: Move term bindings into a proper function run as a hook when loading term, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode dd59643 135/325: Modify log-edit mode in a proper function, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 331a359 007/325: Directly bind a bunch of shift keys, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 25dd364 038/325: Remove ergoemacs-command-loop--modal-stack, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 96cb33d 040/325: Remove ergoemacs-command-loop--modal-p, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode ade1df9 046/325: Cleanup, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 61410ff 051/325: Fix a typo when invoking a timeout, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 6868238 058/325: Merge branch 'master' into ergoterm, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 87a332c 073/325: Merge branch 'master' into HEAD, Stefan Monnier, 2021/10/23