mode-line change file name

diff --git a/emacs.d/my-mode-line.el b/emacs.d/my-mode-line.el
index 53aa7b8..89de262 100644 (file)
--- a/emacs.d/my-mode-line.el
+++ b/emacs.d/my-mode-line.el
@@ -66,8 +66,6 @@ window type."
                   (:eval
                    (let* ((window-type (my-get-window-type))
                          (active (powerline-selected-window-active))
-                         ;; (active t)
-                          ;; (my-face1 (if active 'sd/powerline-active1 'powerline-inactive1))
                          (my-face1 'sd/powerline-active1 )
                           ;; (my-face-buffer-modified (if (and (sd/buffer-is-eshel-or-scratch) (buffer-modified-p) (not buffer-read-only)) 
                           ;;                              'sd/buffer-modified-active1
@@ -90,25 +88,29 @@ window type."
                                          (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))
-                                  (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))
+                          (lhs (cond ((or (= window-type 1) (= window-type 2))
+                                     (list (powerline-raw "%* " lface 'l)
+                                           (funcall separator-left lface face1 )))
+                                    ((or (= window-type 3) (= window-type 6))
+                                     (list (powerline-buffer-id lface 'l)
+                                           (powerline-raw " " lface)
+                                           (funcall separator-left lface face1 )))
+                                    (t
+                                     nil)))
                           (center (if (or (= window-type 1) (= window-type 4))
                                    (list (powerline-raw " " face1)
                                          (funcall separator-right face1 cface)
-                                         (powerline-raw (concat " ==" (number-to-string (my-get-window-type)) "== ") cface)
+                                         (powerline-buffer-id cface 'r)
                                          (funcall separator-left cface face1))
-                                   nil))
-                          (rhs (if (or (= window-type 1) (= window-type 3) (= window-type 2) (= window-type 5))
-                                  (list (funcall separator-right face1 rface)
-                                        (powerline-raw (format-time-string " %I:%M %p  ") rface 'r))
-                                nil)))
+                                   nil))                          (rhs (cond ((or (= window-type 1) (= window-type 3))
+                                     (list (funcall separator-right face1 rface)
+                                           (powerline-raw (format-time-string " %I:%M %p ") rface 'r)))
+                                    ((or (= window-type 2) (= window-type 5))
+                                     (list (funcall separator-right face1 rface)
+                                           (powerline-buffer-id rface 'r)
+                                           (powerline-raw " " rface)))
+                                    (t
+                                     nil))))
                      (concat (powerline-render lhs)
                              (powerline-fill-center face1 (/ (powerline-width center) 2.0))
                              (powerline-render center)