[elpa] 30/287: Started adding modes and setq assignments.

[Matthew Fidler]

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

commit c931e0f72c487e7100a40956d8f4400be6fcfede
Author: Matthew L. Fidler <address@hidden>
Date:   Sun Jun 1 15:31:19 2014 +0800

    Started adding modes and setq assignments.
---
 ergoemacs-theme-engine.el |   53 +++++++++++++++++++++++++++-----------------
 1 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/ergoemacs-theme-engine.el b/ergoemacs-theme-engine.el
index dcceca8..6934e1e 100644
--- a/ergoemacs-theme-engine.el
+++ b/ergoemacs-theme-engine.el
@@ -653,7 +653,16 @@ Assumes maps are orthogonal."
            :type ergoemacs-composite-map)
    (maps :initarg :fixed
          :initform ()
-         :type list))
+         :type list)
+   (init :initarg :init
+         :initform ()
+         :type list)
+   (applied-init :initarg :applied-init
+                 :initform ()
+                 :type list)
+   (deferred-init :initarg :deferred-init
+     :initform ()
+     :type list))
   "`ergoemacs-mode' theme-component maps")
 
 (defmethod ergoemacs-theme-component-maps--ini ((obj 
ergoemacs-theme-component-maps))
@@ -737,7 +746,10 @@ Assumes maps are orthogonal."
   (if (not (ergoemacs-theme-component-maps-p 
ergoemacs-theme-component-maps--curr-component))
       (warn "`ergoemacs-set' is meant to be called in a theme definition.")
     ;; ergoemacs-set definition.
-    ))
+    (with-slots (init) ergoemacs-theme-component-maps--curr-component
+      (push (list symbol newval) init)
+      (oset ergoemacs-theme-component-maps--curr-component
+            init init))))
 
 (defun ergoemacs-theme-component--with-hook (hook plist body)
   ;; Adapted from Stefan Monnier
@@ -785,7 +797,7 @@ Assumes maps are orthogonal."
                `(ergoemacs-define-key 'global-map ,(nth 1 elt) nil))
               ((ignore-errors (eq (nth 0 elt) 'set))
                ;; Currently doesn't support (setq a b c d ), but it should.
-               `(ergoemacs-theme-component--set ,(nth 1 elt) ,(nth 2 elt)))
+               `(ergoemacs-set ,(nth 1 elt) ,(nth 2 elt)))
               ((ignore-errors (eq (nth 0 elt) 'setq))
                (let ((tmp-elt elt)
                      (ret '()))
@@ -794,8 +806,8 @@ Assumes maps are orthogonal."
                    (push `(ergoemacs-set (quote ,(pop tmp-elt)) ,(pop 
tmp-elt)) ret))
                  (push 'progn ret)
                  ret))
-              ;; ((ignore-errors (string-match "-mode$" (symbol-name (nth 0 
elt))))
-              ;;  `(ergoemacs-theme-component--mode (quote ,(nth 0 elt)) ,(nth 
1 elt)))
+              ((ignore-errors (string-match "-mode$" (symbol-name (nth 0 
elt))))
+               `(ergoemacs-set (quote ,(nth 0 elt)) ,(nth 1 elt)))
               ((ignore-errors (eq (nth 0 elt) 'global-set-key))
                (if (keymapp (symbol-value (nth 2 elt)))
                    `(ergoemacs-define-key 'global-map ,(nth 1 elt) (quote 
,(nth 2 elt)))
@@ -897,22 +909,21 @@ Afterward it was modified for use with `ergoemacs-mode' 
to use additional parsin
   (let ((kb (make-symbol "body-and-plist")))
     (setq kb (ergoemacs-theme-component--parse body-and-plist))
     
-    `(ergoemacs-theme-component--create-component
-      ,(nth 0 kb)
-      (lambda () ,@(nth 1 kb)))))
-
-(message "%s"
-         (macroexpand `(ergoemacs-theme-comp standard-vars ()
-                                             "Enabled/changed variables/modes"
-                                             (setq org-CUA-compatible t
-                                                   org-support-shift-select t
-                                                   set-mark-command-repeat-pop 
t
-                                                   org-special-ctrl-a/e t
-                                                   ido-vertical-define-keys 
'C-n-C-p-up-down-left-right
-                                                   scroll-error-top-bottom t)
-                                             (shift-select-mode t)
-                                             (delete-selection-mode 1)
-                                             (setq ))))
+    `(lambda() (ergoemacs-theme-component--create-component
+           ,(nth 0 kb)
+           (lambda () ,@(nth 1 kb))))))
+
+;; (message "%s"
+;;          (macroexpand `(ergoemacs-theme-comp standard-vars ()
+;;                                              "Enabled/changed 
variables/modes"
+;;                                              (setq org-CUA-compatible t
+;;                                                    org-support-shift-select 
t
+;;                                                    
set-mark-command-repeat-pop t
+;;                                                    org-special-ctrl-a/e t
+;;                                                    ido-vertical-define-keys 
'C-n-C-p-up-down-left-right
+;;                                                    scroll-error-top-bottom 
t)
+;;                                              (shift-select-mode t)
+;;                                              (delete-selection-mode 1))))