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

Refactor narf-evil-substitute & narf-anzu modeline segments

Browse source
This commit is contained in:
Henrik Lissner 2015-11-21 16:17:26 -05:00
parent 7a332593ef
commit 8f212aa926
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
core/core-ui.el
View file

@ -304,7 +304,7 @@ anzu to be enabled."
(anzu--format-here-position here total) (anzu--format-here-position here total)
total (if anzu--overflow-p "+" ""))) total (if anzu--overflow-p "+" "")))
:face (if active 'mode-line-count-face 'mode-line-inactive) :face (if active 'mode-line-count-face 'mode-line-inactive)
:when (evil-ex-hl-active-p 'evil-ex-search) :when (and (> anzu--total-matched 0) (evil-ex-hl-active-p 'evil-ex-search))
:skip-alternate t :skip-alternate t
:tight t) :tight t)
@ -336,8 +336,10 @@ iedit."
(let ((range (if evil-ex-range (let ((range (if evil-ex-range
(cons (car evil-ex-range) (cadr evil-ex-range)) (cons (car evil-ex-range) (cadr evil-ex-range))
(cons (line-beginning-position) (line-end-position)))) (cons (line-beginning-position) (line-end-position))))
(pattern (car (evil-delimited-arguments evil-ex-argument 2)))) (pattern (car-safe (evil-delimited-arguments evil-ex-argument 2))))
(format "%s matches" (count-matches pattern (car range) (cdr range)) evil-ex-argument)) (if pattern
(format "%s matches" (count-matches pattern (car range) (cdr range)) evil-ex-argument)
" ... "))
:face (if active 'mode-line-count-face 'mode-line-inactive) :face (if active 'mode-line-count-face 'mode-line-inactive)
:skip-alternate t :skip-alternate t
:when (and (evil-ex-p) (evil-ex-hl-active-p 'evil-ex-substitute))) :when (and (evil-ex-p) (evil-ex-hl-active-p 'evil-ex-substitute)))
@ -349,8 +351,7 @@ iedit."
;; Initialize modeline ;; Initialize modeline
(spaceline-install (spaceline-install
;; Left side ;; Left side
'((evil-state :face highlight-face :when active :skip-alternate t) '(narf-anzu narf-iedit narf-evil-substitute
narf-anzu narf-iedit narf-evil-substitute
(narf-buffer-path remote-host) (narf-buffer-path remote-host)
narf-buffer-modified narf-buffer-modified
narf-vc narf-vc