Improve faces of multiple-cursors and silence warnings.

This commit is contained in:
Vincent Zhang 2019-03-11 15:38:06 +07:00
parent dc83e6a4c3
commit 5dc0b5e7cd

View file

@ -120,6 +120,7 @@
(declare-function lsp--workspace-print 'lsp-mode) (declare-function lsp--workspace-print 'lsp-mode)
(declare-function lsp-workspaces 'lsp-mode) (declare-function lsp-workspaces 'lsp-mode)
(declare-function magit-toplevel 'magit-git) (declare-function magit-toplevel 'magit-git)
(declare-function mc/num-cursors 'multiple-cursors-core)
(declare-function minions-minor-modes-menu 'minions) (declare-function minions-minor-modes-menu 'minions)
(declare-function mu4e-alert-default-mode-line-formatter 'mu4e-alert) (declare-function mu4e-alert-default-mode-line-formatter 'mu4e-alert)
(declare-function mu4e-alert-enable-mode-line-display 'mu4e-alert) (declare-function mu4e-alert-enable-mode-line-display 'mu4e-alert)
@ -130,6 +131,8 @@
(declare-function persp-contain-buffer-p 'persp-mode) (declare-function persp-contain-buffer-p 'persp-mode)
(declare-function persp-remove-buffer 'persp-mode) (declare-function persp-remove-buffer 'persp-mode)
(declare-function persp-switch 'persp-mode) (declare-function persp-switch 'persp-mode)
(declare-function popup-create 'popup)
(declare-function popup-delete 'popup)
(declare-function symbol-overlay-assoc 'symbol-overlay) (declare-function symbol-overlay-assoc 'symbol-overlay)
(declare-function symbol-overlay-get-list 'symbol-overlay) (declare-function symbol-overlay-get-list 'symbol-overlay)
(declare-function symbol-overlay-get-symbol 'symbol-overlay) (declare-function symbol-overlay-get-symbol 'symbol-overlay)
@ -467,9 +470,12 @@ mouse-1: Display minor modes menu"
'mouse-1 #'minions-minor-modes-menu)) 'mouse-1 #'minions-minor-modes-menu))
" ") " ")
(propertize (propertize
(replace-regexp-in-string (regexp-quote "%") "%%" (concat
(format-mode-line '("" minor-mode-alist " ")) (replace-regexp-in-string (regexp-quote "%")
t t) "%%%%"
(format-mode-line '("" minor-mode-alist))
t t)
" ")
'face (if active 'face (if active
'doom-modeline-buffer-minor-mode 'doom-modeline-buffer-minor-mode
'mode-line-inactive)))))) 'mode-line-inactive))))))
@ -1053,13 +1059,13 @@ Requires `anzu', also `evil-anzu' if using `evil-mode' for compatibility with
(cond ((bound-and-true-p multiple-cursors-mode) (cond ((bound-and-true-p multiple-cursors-mode)
(cons (mc/num-cursors) (cons (mc/num-cursors)
(if (doom-modeline--active) (if (doom-modeline--active)
'doom-modeline-eldoc-bar 'doom-modeline-panel
'mode-line-inactive))) 'mode-line-inactive)))
((bound-and-true-p evil-mc-cursor-list) ((bound-and-true-p evil-mc-cursor-list)
(cons (length evil-mc-cursor-list) (cons (length evil-mc-cursor-list)
(cond ((not (doom-modeline--active)) 'mode-line-inactive) (cond ((not (doom-modeline--active)) 'mode-line-inactive)
(evil-mc-frozen 'doom-modeline-panel) (evil-mc-frozen 'doom-modeline-bar)
('doom-modeline-eldoc-bar)))) ('doom-modeline-panel))))
((cons nil nil))) ((cons nil nil)))
(when count (when count
(concat (propertize " " 'face face) (concat (propertize " " 'face face)