branch: externals/ergoemacs-mode
commit 5c39790d491d25d95512b40ad42c7d156796cdb1
Author: Walter Landry <wlan...@caltech.edu>
Commit: Walter Landry <wlan...@caltech.edu>
Remove ergoemacs-theme
---
ergoemacs-macros.el | 84 --------------------------------------------------
ergoemacs-mode.el | 16 ----------
ergoemacs-test.el | 1 -
ergoemacs-translate.el | 1 -
4 files changed, 102 deletions(-)
diff --git a/ergoemacs-macros.el b/ergoemacs-macros.el
index 77852d2..3bf354c 100644
--- a/ergoemacs-macros.el
+++ b/ergoemacs-macros.el
@@ -460,90 +460,6 @@ additional parsing routines defined by PARSE-FUNCTION."
(list plist remaining))))
;;;###autoload
-(defmacro ergoemacs-theme (&rest body-and-plist)
- "Define an ergoemacs-theme.
-
-This macro parses BODY-AND-PLIST into an `ergoemacs-mode' theme.
-
-- :components -- list of components that this theme uses. These
- can't be seen or toggled.
-
-- :optional-on -- list of components that are optional and are on
- by default
-
-- :optional-off -- list of components that are optional and off
- by default
-
-- :options-menu -- Menu options list
-
-- :silent -- If this theme is \"silent\", i.e. doesn't show up in
- the Themes menu.
-
-- :based-on -- what `ergoemacs-mode' theme this is based on.
-
-The rest of the body is an `ergoemacs-theme-component' named
- THEME-NAME-theme."
- (declare (doc-string 2)
- (indent 2))
- (let ((kb (make-symbol "body-and-plist"))
- (tmp (make-symbol "tmp"))
- (based-on (make-symbol "based-on")))
- (setq kb (ergoemacs-theme-component--parse-keys-and-body body-and-plist))
- (setq tmp (eval (plist-get (nth 0 kb) :components)))
- (push (intern (concat (plist-get (nth 0 kb) :name) "-theme")) tmp)
- (setq tmp (plist-put (nth 0 kb) :components tmp))
- (setq based-on (plist-get (nth 0 kb) :based-on))
- ;; (message "First Based-On: %s" based-on)
- (setq based-on (or (and (stringp based-on) based-on)
- (and (symbolp based-on) (symbol-name based-on))
- (and (eq (car based-on) 'quote) (symbol-name (car (cdr
based-on))))
- nil))
- ;; (message "Last Based-On: %s" based-on)
- (dolist (comp '(:optional-on :optional-off :options-menu))
- (setq tmp (plist-put (nth 0 kb) comp
- (eval (plist-get (nth 0 kb) comp)))))
- (macroexpand-all
- `(let* ((based-on (ergoemacs-gethash ,based-on ergoemacs-theme-hash))
- (curr-plist ',tmp)
- (opt-on (plist-get curr-plist ':optional-on))
- (opt-off (plist-get curr-plist ':optional-off))
- (comp (plist-get curr-plist ':components))
- (themes (ergoemacs-gethash "defined-themes" ergoemacs-theme-hash))
- (silent (ergoemacs-gethash "silent-themes" ergoemacs-theme-hash))
- (included (append opt-on opt-off comp))
- (file (or load-file-name (buffer-file-name)))
- (mod (list file (and (stringp file) (nth 5 (file-attributes
file))))))
- (when (not (boundp 'ergoemacs--component-file-mod-time-list))
- (setq ergoemacs--component-file-mod-time-list nil))
- (push ,(plist-get (nth 0 kb) :name) themes)
- (push ,(plist-get (nth 0 kb) :name) silent)
- (setq curr-plist (plist-put curr-plist :file file))
- (unless (member mod ergoemacs--component-file-mod-time-list)
- (push mod ergoemacs--component-file-mod-time-list))
- (if (not based-on)
- (puthash ,(plist-get (nth 0 kb) ':name) curr-plist
ergoemacs-theme-hash)
- (dolist (type '(:optional-on :optional-off :components))
- (dolist (comp (plist-get based-on type))
- (unless (memq comp included)
- (setq curr-plist
- (plist-put curr-plist type
- (append (plist-get curr-plist type)
- (list comp)))))))
- (when (and (not (plist-get curr-plist :options-menu))
- (plist-get based-on :options-menu))
- (setq curr-plist
- (plist-put curr-plist :options-menu
- (plist-get based-on :options-menu))))
- (puthash ,(plist-get (nth 0 kb) :name) curr-plist
- ergoemacs-theme-hash))
- (if ,(plist-get (nth 0 kb) :silent)
- (puthash "silent-themes" silent ergoemacs-theme-hash)
- (puthash "defined-themes" themes ergoemacs-theme-hash))
- (ergoemacs-theme-component ,(intern (concat (plist-get (nth 0 kb)
:name) "-theme")) ()
- ,(format "Generated theme component for %s theme" (plist-get (nth 0
kb) :name))
- ,@(nth 1 kb))))))
-
-;;;###autoload
(defmacro ergoemacs-deftheme (name desc based-on &rest differences)
"Create theme layout for `ergoemacs-mode' key-bindings.
diff --git a/ergoemacs-mode.el b/ergoemacs-mode.el
index b6f1e1d..83ad9ff 100644
--- a/ergoemacs-mode.el
+++ b/ergoemacs-mode.el
@@ -107,20 +107,6 @@ Added beginning-of-buffer Alt+n (QWERTY notation) and
end-of-buffer Alt+Shift+n"
:group 'convenience
:group 'emulations)
-(defcustom ergoemacs-theme (if (and (boundp 'ergoemacs-variant)
ergoemacs-variant)
- ergoemacs-variant
- (if (and (boundp 'ergoemacs-theme)
ergoemacs-theme)
- ergoemacs-theme
- nil))
- "Ergoemacs Keyboard Layout Themes."
- :type '(choice
- (const :tag "Standard" :value nil)
- (choice (symbol :tag "Other (symbol)")
- (string :tag "Other (string)")))
- :set 'ergoemacs-set-default
- :initialize #'custom-initialize-default
- :group 'ergoemacs-mode)
-
;;; ergoemacs-keymap
(defvar ergoemacs-keymap (make-sparse-keymap)
@@ -150,7 +136,6 @@ Added beginning-of-buffer Alt+n (QWERTY notation) and
end-of-buffer Alt+Shift+n"
:group 'ergoemacs-mode)
-(defvar ergoemacs-theme)
(defcustom ergoemacs-mode-line t
"Determines when the ergoemacs-mode modeline indicator is shown."
:type '(choice
@@ -715,7 +700,6 @@ not be useful. However instead of using
(eval (macroexpand `(defalias ',(nth 0 x) ',(nth 1 x))))))
(autoload 'ergoemacs-component "ergoemacs-macros")
-(autoload 'ergoemacs-theme "ergoemacs-macros")
(autoload 'ergoemacs "ergoemacs-macros")
(defcustom ergoemacs-keyboard-layout "us"
diff --git a/ergoemacs-test.el b/ergoemacs-test.el
index 60b30cb..08c50ca 100644
--- a/ergoemacs-test.el
+++ b/ergoemacs-test.el
@@ -38,7 +38,6 @@
(defvar ergoemacs-map--)
(defvar ergoemacs-layout-us)
(defvar ergoemacs-keyboard-layout)
-(defvar ergoemacs-theme)
(defvar ergoemacs-command-loop-type)
(defvar ergoemacs-dir)
(defvar ergoemacs-mode)
diff --git a/ergoemacs-translate.el b/ergoemacs-translate.el
index 4c43780..bb8ed78 100644
--- a/ergoemacs-translate.el
+++ b/ergoemacs-translate.el
@@ -62,7 +62,6 @@
(defvar ergoemacs-translate--hash)
(defvar ergoemacs-translate--event-hash)
(defvar ergoemacs-dir)
-(defvar ergoemacs-theme)
(defvar ergoemacs-inkscape)
(defvar ergoemacs-command-loop--universal-functions)
