mirror of
https://github.com/correl/doom-modeline.git
synced 2024-11-27 11:09:52 +00:00
Show input-method and lsp in inactive windows.
This commit is contained in:
parent
834f59c2ef
commit
3d1490d6e6
1 changed files with 18 additions and 20 deletions
|
@ -1521,27 +1521,26 @@ mouse-1: Display Line and Column Mode Menu"
|
||||||
|
|
||||||
(doom-modeline-def-segment input-method
|
(doom-modeline-def-segment input-method
|
||||||
"The current input method."
|
"The current input method."
|
||||||
(when (doom-modeline--active)
|
(propertize
|
||||||
(propertize
|
(cond
|
||||||
(cond
|
(current-input-method
|
||||||
(current-input-method
|
(concat " " current-input-method-title " "))
|
||||||
(concat " " current-input-method-title " "))
|
((and (bound-and-true-p evil-local-mode)
|
||||||
((and (bound-and-true-p evil-local-mode)
|
(bound-and-true-p evil-input-method))
|
||||||
(bound-and-true-p evil-input-method))
|
(concat
|
||||||
(concat
|
" "
|
||||||
" "
|
(nth 3 (assoc default-input-method input-method-alist))
|
||||||
(nth 3 (assoc default-input-method input-method-alist))
|
" "))
|
||||||
" "))
|
(t ""))
|
||||||
(t ""))
|
'face (if (doom-modeline--active) 'doom-modeline-buffer-major-mode)
|
||||||
'face 'doom-modeline-buffer-major-mode
|
'help-echo (concat
|
||||||
'help-echo (concat
|
"Current input method: "
|
||||||
"Current input method: "
|
current-input-method
|
||||||
current-input-method
|
"\n\
|
||||||
"\n\
|
|
||||||
mouse-2: Disable input method\n\
|
mouse-2: Disable input method\n\
|
||||||
mouse-3: Describe current input method")
|
mouse-3: Describe current input method")
|
||||||
'mouse-face 'mode-line-highlight
|
'mouse-face 'mode-line-highlight
|
||||||
'local-map mode-line-input-method-map)))
|
'local-map mode-line-input-method-map))
|
||||||
|
|
||||||
|
|
||||||
;;
|
;;
|
||||||
|
@ -1551,7 +1550,6 @@ mouse-3: Describe current input method")
|
||||||
(doom-modeline-def-segment lsp
|
(doom-modeline-def-segment lsp
|
||||||
"The LSP server state."
|
"The LSP server state."
|
||||||
(if (and doom-modeline-lsp
|
(if (and doom-modeline-lsp
|
||||||
(doom-modeline--active)
|
|
||||||
(bound-and-true-p lsp-mode))
|
(bound-and-true-p lsp-mode))
|
||||||
(concat (lsp-mode-line) " ")))
|
(concat (lsp-mode-line) " ")))
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue