improve face setting logic

diff --git a/emacs.d/my-mode-line.el b/emacs.d/my-mode-line.el
index 639fe0e..53aa7b8 100644 (file)
--- a/emacs.d/my-mode-line.el
+++ b/emacs.d/my-mode-line.el
@@ -81,40 +81,33 @@ window type."
                           (separator-right (intern (format "powerline-%s-%s"
                                                            (powerline-current-separator)
                                                            (cdr powerline-default-separator-dir))))
+                         (lface (if (and (not active)
+                                         (or (= window-type 3) (= window-type 6)))
+                                    face2
+                                  my-face1))
+                         (cface (if active my-face1 face2))
+                         (rface (if (and (not active)
+                                         (or (= window-type 2) (= window-type 5)))
+                                    face2
+                                  my-face1))
                           (lhs (if (or (= window-type 1) (= window-type 2) (= window-type 3) (= window-type 6))
-                                  (let ((lface))
-                                    (if (or (= window-type 1) (= window-type 2))
-                                        (setq lface my-face1)
-                                      (if active
-                                          (setq lface my-face1)
-                                        (setq lface face2)))
-                                    (list (powerline-raw "%* " lface 'l)
-                                          ;; (powerline-raw "%* " my-face-buffer-modified 'l)
-                                          (powerline-raw " " lface)
-                                          (funcall separator-left lface face1)
-                                          (powerline-narrow face1 'l)
-                                          ;; (sd/powerline-simpler-vc (powerline-vc face1))
-                                          ))
+                                  (list (powerline-raw "%* " lface 'l)
+                                        ;; (powerline-raw "%* " my-face-buffer-modified 'l)
+                                        (powerline-raw " " lface)
+                                        (funcall separator-left lface face1)
+                                        (powerline-narrow face1 'l)
+                                        ;; (sd/powerline-simpler-vc (powerline-vc face1))
+                                        )
                                 nil))
                           (center (if (or (= window-type 1) (= window-type 4))
-                                     (let ((cface))
-                                       (if active
-                                           (setq cface my-face1)
-                                         (setq cface face2))
-                                       (list (powerline-raw " " face1)
-                                             (funcall separator-right face1 cface)
-                                             (powerline-raw (concat " ==" (number-to-string (my-get-window-type)) "== ") cface)
-                                             (funcall separator-left cface face1)))
+                                   (list (powerline-raw " " face1)
+                                         (funcall separator-right face1 cface)
+                                         (powerline-raw (concat " ==" (number-to-string (my-get-window-type)) "== ") cface)
+                                         (funcall separator-left cface face1))
                                    nil))
                           (rhs (if (or (= window-type 1) (= window-type 3) (= window-type 2) (= window-type 5))
-                                  (let ((rface))
-                                    (if (or (= window-type 1) (= window-type 3))
-                                        (setq rface my-face1)
-                                      (if active
-                                          (setq rface my-face1)
-                                        (setq rface face2)))
-                                    (list (funcall separator-right face1 rface)
-                                          (powerline-raw (format-time-string " %I:%M %p  ") rface 'r)))
+                                  (list (funcall separator-right face1 rface)
+                                        (powerline-raw (format-time-string " %I:%M %p  ") rface 'r))
                                 nil)))
                      (concat (powerline-render lhs)
                              (powerline-fill-center face1 (/ (powerline-width center) 2.0))