mirror of
https://github.com/correl/doom-modeline.git
synced 2024-11-23 11:09:54 +00:00
Fix #202: Be compatible with delight.
Don't use format-mode-line for mode-name since delight advices it.
This commit is contained in:
parent
59a5d1e8d2
commit
db49f49dc6
1 changed files with 12 additions and 14 deletions
|
@ -479,13 +479,14 @@ directory, the file name, and its state (modified, read-only or non-existent)."
|
|||
(propertize
|
||||
(concat
|
||||
(doom-modeline-spc)
|
||||
(propertize (format-mode-line mode-name)
|
||||
'help-echo "Major mode\n\
|
||||
(format-mode-line
|
||||
`(:propertize ("" mode-name)
|
||||
help-echo "Major mode\n\
|
||||
mouse-1: Display major mode menu\n\
|
||||
mouse-2: Show help for major mode\n\
|
||||
mouse-3: Toggle minor modes"
|
||||
'mouse-face 'mode-line-highlight
|
||||
'local-map mode-line-major-mode-keymap)
|
||||
mouse-face mode-line-highlight
|
||||
local-map ,mode-line-major-mode-keymap))
|
||||
(when (and doom-modeline-env-version doom-modeline-env--version)
|
||||
(format " %s" doom-modeline-env--version))
|
||||
(and (boundp 'text-scale-mode-amount)
|
||||
|
@ -534,16 +535,13 @@ mouse-1: Display minor modes menu"
|
|||
'local-map (make-mode-line-mouse-map
|
||||
'mouse-1 #'minions-minor-modes-menu))
|
||||
(doom-modeline-spc))
|
||||
(propertize
|
||||
(concat
|
||||
(replace-regexp-in-string (regexp-quote "%")
|
||||
"%%%%"
|
||||
(format-mode-line minor-mode-alist)
|
||||
t t)
|
||||
(doom-modeline-spc))
|
||||
'face (if active
|
||||
'doom-modeline-buffer-minor-mode
|
||||
'mode-line-inactive))))))
|
||||
(concat
|
||||
(format-mode-line
|
||||
`(:propertize ("" minor-mode-alist)
|
||||
face ,(if active
|
||||
'doom-modeline-buffer-minor-mode
|
||||
'mode-line-inactive)))
|
||||
(doom-modeline-vspc))))))
|
||||
|
||||
|
||||
;;
|
||||
|
|
Loading…
Reference in a new issue