github/doom-modeline
1
0
Fork 0
mirror of https://github.com/correl/doom-modeline.git synced 2024-11-23 19:19:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

HACK: Compatible with loading `doom-modeline' after init time.

Browse source
This commit is contained in:
Vincent Zhang 2018-11-14 03:00:21 +08:00
parent 25b04d5c40
commit 2b7ee7451f
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
doom-modeline.el
View file

@ -495,7 +495,7 @@ active.")
'xpm t :ascent 'center))))) 'xpm t :ascent 'center)))))
(defvar-local doom-modeline-buffer-file-name nil) (defvar-local doom-modeline-buffer-file-name nil)
(defun doom-modeline-update-buffer-file-name () (defun doom-modeline-update-buffer-file-name (&rest _)
"Propertized variable `buffer-file-name' based on `doom-modeline-buffer-file-name-style'." "Propertized variable `buffer-file-name' based on `doom-modeline-buffer-file-name-style'."
(setq doom-modeline-buffer-file-name (setq doom-modeline-buffer-file-name
(let ((buffer-file-name (or (buffer-file-name (buffer-base-buffer)) ""))) (let ((buffer-file-name (or (buffer-file-name (buffer-base-buffer)) "")))
@ -525,6 +525,7 @@ active.")
(add-hook 'find-file-hook #'doom-modeline-update-buffer-file-name) (add-hook 'find-file-hook #'doom-modeline-update-buffer-file-name)
(add-hook 'after-revert-hook #'doom-modeline-update-buffer-file-name) (add-hook 'after-revert-hook #'doom-modeline-update-buffer-file-name)
(add-hook 'after-save-hook #'doom-modeline-update-buffer-file-name) (add-hook 'after-save-hook #'doom-modeline-update-buffer-file-name)
(advice-add #'select-window :after #'doom-modeline-update-buffer-file-name)
(defun doom-modeline--buffer-file-name-truncate (file-path true-file-path &optional truncate-tail) (defun doom-modeline--buffer-file-name-truncate (file-path true-file-path &optional truncate-tail)
"Propertized variable `buffer-file-name' that truncates every dir along path. "Propertized variable `buffer-file-name' that truncates every dir along path.
@ -617,6 +618,10 @@ buffer where knowing the current project directory is important."
(doom-modeline-def-segment buffer-info (doom-modeline-def-segment buffer-info
"Combined information about the current buffer, including the current working "Combined information about the current buffer, including the current working
directory, the file name, and its state (modified, read-only or non-existent)." directory, the file name, and its state (modified, read-only or non-existent)."
;; HACK: Compatible with loading `doom-modeline' after init time.
(unless doom-modeline-buffer-file-name (doom-modeline-update-buffer-file-name))
(concat (cond (buffer-read-only (concat (cond (buffer-read-only
(concat (doom-modeline-icon-octicon (concat (doom-modeline-icon-octicon
"lock" "lock"
@ -643,11 +648,12 @@ directory, the file name, and its state (modified, read-only or non-existent)."
:v-adjust -0.05) :v-adjust -0.05)
" "))) " ")))
(if doom-modeline-buffer-file-name (if doom-modeline-buffer-file-name
;; Show buffer name if the buffer name doesn't equal the file name. ;; Show buffer name if it doesn't equal the file name.
;; NOTE: Format: "buffer-file-name[buffer-name]". ;; NOTE: Format: "buffer-file-name[buffer-name]".
;; Except the same buffer names in different directories. ;; Except the same buffer names in different directories.
(if (string-equal (file-name-nondirectory doom-modeline-buffer-file-name) (if (string-equal
(replace-regexp-in-string "<.+>$" "" (or (buffer-name) ""))) (file-name-nondirectory doom-modeline-buffer-file-name)
(replace-regexp-in-string "<.+>$" "" (or (buffer-name) "")))
doom-modeline-buffer-file-name doom-modeline-buffer-file-name
(format "%s[%s]" doom-modeline-buffer-file-name (buffer-name))) (format "%s[%s]" doom-modeline-buffer-file-name (buffer-name)))
"%b"))) "%b")))