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

Fix #202: Be compatible with delight.

Browse source 
Don't use format-mode-line for mode-name since delight advices it.
This commit is contained in:
Vincent Zhang 2019-08-02 01:11:00 +08:00
parent 59a5d1e8d2
commit db49f49dc6
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
doom-modeline-segments.el
View file

@ -479,13 +479,14 @@ directory, the file name, and its state (modified, read-only or non-existent)."
(propertize (propertize
(concat (concat
(doom-modeline-spc) (doom-modeline-spc)
(propertize (format-mode-line mode-name) (format-mode-line
'help-echo "Major mode\n\ `(:propertize ("" mode-name)
help-echo "Major mode\n\
mouse-1: Display major mode menu\n\ mouse-1: Display major mode menu\n\
mouse-2: Show help for major mode\n\ mouse-2: Show help for major mode\n\
mouse-3: Toggle minor modes" mouse-3: Toggle minor modes"
'mouse-face 'mode-line-highlight mouse-face mode-line-highlight
'local-map mode-line-major-mode-keymap) local-map ,mode-line-major-mode-keymap))
(when (and doom-modeline-env-version doom-modeline-env--version) (when (and doom-modeline-env-version doom-modeline-env--version)
(format " %s" doom-modeline-env--version)) (format " %s" doom-modeline-env--version))
(and (boundp 'text-scale-mode-amount) (and (boundp 'text-scale-mode-amount)
@ -534,16 +535,13 @@ mouse-1: Display minor modes menu"
'local-map (make-mode-line-mouse-map 'local-map (make-mode-line-mouse-map
'mouse-1 #'minions-minor-modes-menu)) 'mouse-1 #'minions-minor-modes-menu))
(doom-modeline-spc)) (doom-modeline-spc))
(propertize (concat
(concat (format-mode-line
(replace-regexp-in-string (regexp-quote "%") `(:propertize ("" minor-mode-alist)
"%%%%" face ,(if active
(format-mode-line minor-mode-alist) 'doom-modeline-buffer-minor-mode
t t) 'mode-line-inactive)))
(doom-modeline-spc)) (doom-modeline-vspc))))))
'face (if active
'doom-modeline-buffer-minor-mode
'mode-line-inactive))))))
;; ;;