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

Merge branch 'develop' of https://github.com/seagle0128/doom-modeline into develop

Browse source
This commit is contained in:
Vincent Zhang 2018-06-21 22:32:23 +08:00
commit ff3a35a2b1
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
doom-modeline.el
View file

@ -204,7 +204,7 @@ If STRICT-P, return nil if no project was found, otherwise return
;; anzu and evil-anzu expose current/total state that can be displayed in the ;; anzu and evil-anzu expose current/total state that can be displayed in the
;; mode-line. ;; mode-line.
(when (feature 'evil-anzu) (when (featurep 'evil-anzu)
(setq anzu-cons-mode-line-p nil (setq anzu-cons-mode-line-p nil
anzu-minimum-input-length 1 anzu-minimum-input-length 1
anzu-search-threshold 250) anzu-search-threshold 250)
@ -243,17 +243,18 @@ If STRICT-P, return nil if no project was found, otherwise return
(force-mode-line-update)) (force-mode-line-update))
(add-hook 'window-configuration-change-hook #'doom-modeline-set-selected-window) (add-hook 'window-configuration-change-hook #'doom-modeline-set-selected-window)
(add-hook 'doom-after-switch-window-hook #'doom-modeline-set-selected-window) (advice-add #'handle-switch-frame :after #'doom-modeline-set-selected-window)
(advice-add #'select-window :after #'doom-modeline-set-selected-window)
(with-no-warnings (with-no-warnings
(if (not (boundp 'after-focus-change-function)) (if (not (boundp 'after-focus-change-function))
(progn (progn
(add-hook 'focus-in-hook #'doom-modeline-set-selected-window) (add-hook 'focus-in-hook #'doom-modeline-set-selected-window)
(add-hook 'focus-out-hook #'doom-modeline-unset-selected-window)) (add-hook 'focus-out-hook #'doom-modeline-unset-selected-window))
(defun doom-modeline-refresh-frame () (defun doom-modeline-refresh-frame ()
(setq +doom-modeline-current-window nil) (setq doom-modeline-current-window nil)
(cl-loop for frame in (frame-list) (cl-loop for frame in (frame-list)
if (eq (frame-focus-state frame) t) if (eq (frame-focus-state frame) t)
return (setq +doom-modeline-current-window (frame-selected-window frame))) return (setq doom-modeline-current-window (frame-selected-window frame)))
(force-mode-line-update)) (force-mode-line-update))
(add-function :after after-focus-change-function #'doom-modeline-refresh-frame))) (add-function :after after-focus-change-function #'doom-modeline-refresh-frame)))
@ -376,17 +377,17 @@ active."
(defun doom-modeline-maybe-icon-octicon (&rest args) (defun doom-modeline-maybe-icon-octicon (&rest args)
"Display octicon via `ARGS'." "Display octicon via `ARGS'."
(when (and (featurep 'all-the-icons) (display-graphic-p) (not (eq system-type 'windows-nt))) (when (display-graphic-p)
(apply 'all-the-icons-octicon args))) (apply 'all-the-icons-octicon args)))
(defun doom-modeline-maybe-icon-faicon (&rest args) (defun doom-modeline-maybe-icon-faicon (&rest args)
"Display font awesome icon via `ARGS'." "Display font awesome icon via `ARGS'."
(when (and (featurep 'all-the-icons) (display-graphic-p) (not (eq system-type 'windows-nt))) (when (display-graphic-p)
(apply 'all-the-icons-faicon args))) (apply 'all-the-icons-faicon args)))
(defun doom-modeline-maybe-icon-material (&rest args) (defun doom-modeline-maybe-icon-material (&rest args)
"Display material icon via `ARGS'." "Display material icon via `ARGS'."
(when (and (featurep 'all-the-icons) (display-graphic-p) (not (eq system-type 'windows-nt))) (when (display-graphic-p)
(apply 'all-the-icons-material args))) (apply 'all-the-icons-material args)))
(defsubst doom-modeline--active () (defsubst doom-modeline--active ()
@ -748,6 +749,7 @@ lines are selected, or the NxM dimensions of a block selection."
(defsubst doom-modeline--anzu () (defsubst doom-modeline--anzu ()
"Show the match index and total number thereof. Requires `anzu', also "Show the match index and total number thereof. Requires `anzu', also
`evil-anzu' if using `evil-mode' for compatibility with `evil-search'." `evil-anzu' if using `evil-mode' for compatibility with `evil-search'."
(setq anzu-cons-mode-line-p nil)
(when (and anzu--state (not iedit-mode)) (when (and anzu--state (not iedit-mode))
(propertize (propertize
(let ((here anzu--current-position) (let ((here anzu--current-position)