emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ui/modeline: refactor +modeline-encoding segment

Browse source
This commit is contained in:
Henrik Lissner 2018-09-12 23:15:31 -04:00
parent 2b5738194e
commit 0a3334a1f6
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
modules/ui/modeline/config.el
View file

@ -476,21 +476,22 @@ Meant for `+modeline-buffer-path-function'."
(def-modeline-segment! +modeline-encoding (def-modeline-segment! +modeline-encoding
:on-hooks (after-revert-hook after-save-hook find-file-hook) :on-hooks (after-revert-hook after-save-hook find-file-hook)
:on-set (buffer-file-coding-system indent-tabs-mode tab-width) :on-set (buffer-file-coding-system indent-tabs-mode tab-width)
(concat (format (if indent-tabs-mode "⭾%d" "␣%d") (format "%s%d %s %s"
tab-width) (if indent-tabs-mode "⭾" "␣")
" " tab-width
(pcase (coding-system-eol-type buffer-file-coding-system) (pcase (coding-system-eol-type buffer-file-coding-system)
(0 "LF") (0 "LF")
(1 "CRLF") (1 "CRLF")
(2 "CR")) (2 "CR"))
" "
(let* ((sys (coding-system-plist buffer-file-coding-system)) (let* ((sys (coding-system-plist buffer-file-coding-system))
(category (plist-get sys :category))) (category (plist-get sys :category)))
(cond ((eq category 'coding-category-undecided) "") (cond ((eq category 'coding-category-undecided)
"")
((or (eq category 'coding-category-utf-8) ((or (eq category 'coding-category-utf-8)
(eq (plist-get sys :name) 'prefer-utf-8)) (eq (plist-get sys :name) 'prefer-utf-8))
"UTF-8 ") "UTF-8 ")
((concat (upcase (symbol-name (plist-get sys :name))) " ")))))) ((concat (upcase (symbol-name (plist-get sys :name)))
" "))))))
(def-modeline-segment! +modeline-major-mode (def-modeline-segment! +modeline-major-mode
(propertize (format-mode-line mode-name) (propertize (format-mode-line mode-name)