Refactor +modeline-file-path

Remove unused letvars and face management.
This commit is contained in:
Henrik Lissner 2018-08-09 12:58:26 +02:00
parent 01dcc248cf
commit 68dc510a1c
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395

View file

@ -237,16 +237,14 @@ buffers.")
(directory-name-p buffer-file-name)) (directory-name-p buffer-file-name))
(propertize (abbreviate-file-name (or buffer-file-name default-directory)) (propertize (abbreviate-file-name (or buffer-file-name default-directory))
'face 'doom-modeline-buffer-path)) 'face 'doom-modeline-buffer-path))
((let* ((modified-faces (if (buffer-modified-p) 'doom-modeline-buffer-modified)) ((let* ((true-filename (file-truename buffer-file-name))
(true-filename (file-truename buffer-file-name))
(relative-dirs (file-relative-name (file-name-directory true-filename) (relative-dirs (file-relative-name (file-name-directory true-filename)
(concat root "../"))) (concat root "../"))))
(relative-faces (or modified-faces 'doom-modeline-buffer-path))
(file-faces (or modified-faces 'doom-modeline-buffer-file)))
(if (equal "./" relative-dirs) (setq relative-dirs "")) (if (equal "./" relative-dirs) (setq relative-dirs ""))
(concat (propertize relative-dirs 'face (if relative-faces `(:inherit ,relative-faces))) (concat (propertize relative-dirs
'face 'doom-modeline-buffer-path)
(propertize (file-name-nondirectory true-filename) (propertize (file-name-nondirectory true-filename)
'face (if file-faces `(:inherit ,file-faces))))))))) 'face 'doom-modeline-buffer-file)))))))
;; TODO Add shrink-path alternatives ;; TODO Add shrink-path alternatives