emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update modules/ui/doom-modeline

Browse source
This commit is contained in:
Henrik Lissner 2017-02-19 18:45:34 -05:00
parent 48d8244f76
commit dc777e8d76
1 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

29
modules/ui/doom-modeline/config.el
View file

@ -20,7 +20,6 @@
;; anzu and evil-anzu make it possible to display current/total in the ;; anzu and evil-anzu make it possible to display current/total in the
;; mode-line. ;; mode-line.
(@def-package evil-anzu (@def-package evil-anzu
:when (featurep 'evil)
:init :init
(defun +evil*lazy-load-evil-anzu (&rest _) (require 'evil-anzu)) (defun +evil*lazy-load-evil-anzu (&rest _) (require 'evil-anzu))
(advice-add 'evil-ex-start-search :before '+evil*lazy-load-evil-anzu) (advice-add 'evil-ex-start-search :before '+evil*lazy-load-evil-anzu)
@ -219,9 +218,7 @@ active."
(string-to-char " ") (string-to-char " ")
(string-to-char "."))) (string-to-char ".")))
dl)) dl))
(if (eq idx len) (if (eq idx len) "\"};" "\",\n")))
"\"};"
"\",\n")))
data)))) data))))
'xpm t :ascent 'center))))) 'xpm t :ascent 'center)))))
@ -229,8 +226,8 @@ active."
"Displays the buffer's full path relative to the project root (includes the "Displays the buffer's full path relative to the project root (includes the
project root). Excludes the file basename. See `doom-buffer-name' for that." project root). Excludes the file basename. See `doom-buffer-name' for that."
(if buffer-file-name (if buffer-file-name
(let* ((default-directory (f-dirname buffer-file-name)) (let* ((default-directory (file-name-directory buffer-file-name))
(buffer-path (f-relative buffer-file-name (doom-project-root))) (buffer-path (file-relative-name buffer-file-name (doom-project-root)))
(max-length (truncate (* (window-body-width) 0.4)))) (max-length (truncate (* (window-body-width) 0.4))))
(when (and buffer-path (not (equal buffer-path "."))) (when (and buffer-path (not (equal buffer-path ".")))
(if (> (length buffer-path) max-length) (if (> (length buffer-path) max-length)
@ -453,7 +450,7 @@ lines are selected, or the NxM dimensions of a block selection."
(defun +doom-modeline--macro-recording () (defun +doom-modeline--macro-recording ()
"Display current macro being recorded." "Display current macro being recorded."
(when (and (active) defining-kbd-macro) (when (and (active) (bound-and-true-p evil-this-macro))
(let ((sep (propertize " " 'face 'doom-modeline-panel))) (let ((sep (propertize " " 'face 'doom-modeline-panel)))
(concat sep (concat sep
(propertize (char-to-string evil-this-macro) (propertize (char-to-string evil-this-macro)
@ -467,7 +464,8 @@ lines are selected, or the NxM dimensions of a block selection."
(make-variable-buffer-local 'anzu--state) (make-variable-buffer-local 'anzu--state)
(defsubst +doom-modeline--anzu () (defsubst +doom-modeline--anzu ()
"Show the match index and total number thereof. Requires `evil-anzu'." "Show the match index and total number thereof. Requires `evil-anzu'."
(when (evil-ex-hl-active-p 'evil-ex-search) (when (and (bound-and-true-p anzu--current-position)
(evil-ex-hl-active-p 'evil-ex-search))
(propertize (propertize
(format " %s/%d%s " (format " %s/%d%s "
anzu--current-position anzu--total-matched anzu--current-position anzu--total-matched
@ -476,7 +474,8 @@ lines are selected, or the NxM dimensions of a block selection."
(defsubst +doom-modeline--evil-substitute () (defsubst +doom-modeline--evil-substitute ()
"Show number of :s matches in real time." "Show number of :s matches in real time."
(when (and (evil-ex-p) (or (evil-ex-hl-active-p 'evil-ex-substitute) (when (and (featurep 'evil)
(evil-ex-p) (or (evil-ex-hl-active-p 'evil-ex-substitute)
(evil-ex-hl-active-p 'evil-ex-global-match) (evil-ex-hl-active-p 'evil-ex-global-match)
(evil-ex-hl-active-p 'evil-ex-buffer-match))) (evil-ex-hl-active-p 'evil-ex-buffer-match)))
(propertize (propertize
@ -492,7 +491,7 @@ lines are selected, or the NxM dimensions of a block selection."
(defsubst +doom-modeline--iedit () (defsubst +doom-modeline--iedit ()
"Show the number of iedit regions matches + what match you're on." "Show the number of iedit regions matches + what match you're on."
(when iedit-mode (when (and (featurep 'iedit) iedit-mode)
(propertize (propertize
(let ((this-oc (let (message-log-max) (iedit-find-current-occurrence-overlay))) (let ((this-oc (let (message-log-max) (iedit-find-current-occurrence-overlay)))
(length (or (ignore-errors (length iedit-occurrences-overlays)) 0))) (length (or (ignore-errors (length iedit-occurrences-overlays)) 0)))
@ -510,12 +509,10 @@ lines are selected, or the NxM dimensions of a block selection."
(@def-modeline-segment matches (@def-modeline-segment matches
"TODO" "TODO"
(or (concat (if (active) (+doom-modeline--macro-recording)) (or (concat (+doom-modeline--macro-recording)
(when (featurep 'evil) (+doom-modeline--anzu)
(concat (+doom-modeline--anzu) (+doom-modeline--evil-substitute)
(+doom-modeline--evil-substitute))) (+doom-modeline--iedit))
(if (boundp 'iedit-mode) (+doom-modeline--iedit))
)
" %I ")) " %I "))
(@def-modeline-segment media-info (@def-modeline-segment media-info