From b020f8b0a7df6927beb29b429cfb0deba9d96608 Mon Sep 17 00:00:00 2001 From: Vincent Zhang Date: Mon, 24 Sep 2018 22:54:25 +0800 Subject: [PATCH] Merge https://github.com/hlissner/doom-emacs/commit/712b775f36c7908d60359213efe99daf08426c49#diff-0ce4da53ad0195d3b7cf5888417057de. --- doom-modeline.el | 66 ++++++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 30 deletions(-) diff --git a/doom-modeline.el b/doom-modeline.el index 3aaa222..2b0b711 100644 --- a/doom-modeline.el +++ b/doom-modeline.el @@ -460,30 +460,36 @@ active.") 'xpm t :ascent 'center))))) (defun doom-modeline-buffer-file-name () - "Propertized variable `buffer-file-name' based on `+doom-modeline-buffer-file-name-style'." - (let ((buffer-file-name (or buffer-file-name "")) - (buffer-file-truename (or buffer-file-truename ""))) + "Propertized variable `buffer-file-name' based on `doom-modeline-buffer-file-name-style'." + (let ((buffer-file-name (or (buffer-file-name (buffer-base-buffer)) ""))) + (unless buffer-file-truename + (setq buffer-file-truename (file-truename buffer-file-name))) (propertize (pcase doom-modeline-buffer-file-name-style - (`truncate-upto-project (doom-modeline--buffer-file-name 'shrink)) - (`truncate-upto-root (doom-modeline--buffer-file-name-truncate)) - (`truncate-all (doom-modeline--buffer-file-name-truncate t)) - (`relative-to-project (doom-modeline--buffer-file-name-relative)) - (`relative-from-project (doom-modeline--buffer-file-name-relative 'include-project)) - (`file-name (propertize (file-name-nondirectory buffer-file-name) - 'face - (let ((face (or (and (buffer-modified-p) - 'doom-modeline-buffer-modified) - (and (doom-modeline--active) - 'doom-modeline-buffer-file)))) - (when face `(:inherit ,face)))))) + (`truncate-upto-project + (doom-modeline--buffer-file-name buffer-file-name buffer-file-truename 'shrink)) + (`truncate-upto-root + (doom-modeline--buffer-file-name-truncate buffer-file-name buffer-file-truename)) + (`truncate-all + (doom-modeline--buffer-file-name-truncate buffer-file-name buffer-file-truename t)) + (`relative-to-project + (doom-modeline--buffer-file-name-relative buffer-file-name buffer-file-truename)) + (`relative-from-project + (doom-modeline--buffer-file-name-relative buffer-file-name buffer-file-truename 'include-project)) + (`file-name + (propertize (file-name-nondirectory buffer-file-name) + 'face + (let ((face (or (and (buffer-modified-p) + 'doom-modeline-buffer-modified) + (and (doom-modeline--active) + 'doom-modeline-buffer-file)))) + (when face `(:inherit ,face)))))) 'help-echo buffer-file-truename))) -(defun doom-modeline--buffer-file-name-truncate (&optional truncate-tail) - "Propertized variable `buffer-file-name' that truncates every dir along path. - +(defun doom-modeline--buffer-file-name-truncate (file-path true-file-path &optional truncate-tail) + "Propertized `buffer-file-name' that truncates every dir along path. If TRUNCATE-TAIL is t also truncate the parent directory of the file." - (let ((dirs (shrink-path-prompt (file-name-directory buffer-file-truename))) + (let ((dirs (shrink-path-prompt (file-name-directory true-file-path))) (active (doom-modeline--active))) (if (null dirs) (propertize "%b" 'face (if active 'doom-modeline-buffer-file)) @@ -496,27 +502,27 @@ If TRUNCATE-TAIL is t also truncate the parent directory of the file." (if truncate-tail (substring basename 0 1) basename) "/") 'face (if dir-faces `(:inherit ,dir-faces))) - (propertize (file-name-nondirectory buffer-file-name) + (propertize (file-name-nondirectory file-path) 'face (if file-faces `(:inherit ,file-faces))))))))) -(defun doom-modeline--buffer-file-name-relative (&optional include-project) - "Propertized variable `buffer-file-name' showing directories relative to INCLUDE-PROJECT root only." + +(defun doom-modeline--buffer-file-name-relative (_file-path true-file-path &optional include-project) + "Propertized variable `buffer-file-name' showing directories relative to project's root only." (let ((root (doom-modeline-project-root)) (active (doom-modeline--active))) (if (null root) (propertize "%b" 'face (if active 'doom-modeline-buffer-file)) (let* ((modified-faces (if (buffer-modified-p) 'doom-modeline-buffer-modified)) - (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-file-path) (if include-project (concat root "../") root))) (relative-faces (or modified-faces (if active 'doom-modeline-buffer-path))) (file-faces (or modified-faces (if active 'doom-modeline-buffer-file)))) (if (equal "./" relative-dirs) (setq relative-dirs "")) (concat (propertize relative-dirs 'face (if relative-faces `(:inherit ,relative-faces))) - (propertize (file-name-nondirectory true-filename) + (propertize (file-name-nondirectory true-file-path) 'face (if file-faces `(:inherit ,file-faces)))))))) -(defun doom-modeline--buffer-file-name (truncate-project-root-parent) +(defun doom-modeline--buffer-file-name (file-path _true-file-path &optional truncate-project-root-parent) "Propertized variable `buffer-file-name'. If TRUNCATE-PROJECT-ROOT-PARENT is t space will be saved by truncating it down @@ -526,12 +532,12 @@ Example: ~/Projects/FOSS/emacs/lisp/comint.el => ~/P/F/emacs/lisp/comint.el" (let* ((project-root (doom-modeline-project-root)) (file-name-split (shrink-path-file-mixed (or project-root "") - (file-name-directory buffer-file-name) - buffer-file-name)) + (file-name-directory file-path) + file-path)) (active (doom-modeline--active))) (if (null file-name-split) (propertize "%b" 'face (if active 'doom-modeline-buffer-file)) - (pcase-let ((`(,root-path-parent ,project ,relative-path ,filename) file-name-split)) + (pcase-let ((`(,root-path-parent ,project ,relative-path ,file-path) file-name-split)) (let ((modified-faces (if (buffer-modified-p) 'doom-modeline-buffer-modified))) (let ((sp-faces (or modified-faces (if active 'font-lock-comment-face))) (project-faces (or modified-faces (if active 'font-lock-string-face))) @@ -547,7 +553,7 @@ Example: 'face sp-props) (propertize (concat project "/") 'face project-props) (if relative-path (propertize relative-path 'face relative-props)) - (propertize filename 'face file-props))))))))) + (propertize file-path 'face file-props))))))))) ;;