From ec11fef2a55fa822cfe1cfb85938b16b06bfa1f1 Mon Sep 17 00:00:00 2001 From: Vincent Zhang Date: Tue, 14 Aug 2018 00:30:49 +0800 Subject: [PATCH] Fix #17: Undefined variable evil-ex-start-word-search. --- doom-modeline.el | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/doom-modeline.el b/doom-modeline.el index 4dcf9d2..3b0b2a5 100644 --- a/doom-modeline.el +++ b/doom-modeline.el @@ -325,30 +325,31 @@ 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 ;; mode-line. (when (featurep 'anzu) - (eval-and-compile - (setq anzu-cons-mode-line-p nil - anzu-minimum-input-length 1 - anzu-search-threshold 250) + (add-hook 'anzu-mode-hook + (lambda () + (setq anzu-cons-mode-line-p nil + anzu-minimum-input-length 1 + anzu-search-threshold 250))) - (defun doom-modeline-fix-anzu-count (positions here) - (cl-loop for (start . end) in positions - collect t into before - when (and (>= here start) (<= here end)) - return (length before) - finally return 0)) + (defun doom-modeline-fix-anzu-count (positions here) + (cl-loop for (start . end) in positions + collect t into before + when (and (>= here start) (<= here end)) + return (length before) + finally return 0)) - (advice-add #'anzu--where-is-here :override #'doom-modeline-fix-anzu-count) + (advice-add #'anzu--where-is-here :override #'doom-modeline-fix-anzu-count) - ;; Avoid anzu conflicts across buffers - ;; (mapc #'make-variable-buffer-local - ;; '(anzu--total-matched anzu--current-position anzu--state - ;; anzu--cached-count anzu--cached-positions anzu--last-command - ;; anzu--last-isearch-string anzu--overflow-p)) + ;; Avoid anzu conflicts across buffers + ;; (mapc #'make-variable-buffer-local + ;; '(anzu--total-matched anzu--current-position anzu--state + ;; anzu--cached-count anzu--cached-positions anzu--last-command + ;; anzu--last-isearch-string anzu--overflow-p)) - ;; Ensure anzu state is cleared when searches & iedit are done - (add-hook 'isearch-mode-end-hook #'anzu--reset-status t) - ;; (add-hook '+evil-esc-hook #'anzu--reset-status t) - (add-hook 'iedit-mode-end-hook #'anzu--reset-status))) + ;; Ensure anzu state is cleared when searches & iedit are done + (add-hook 'isearch-mode-end-hook #'anzu--reset-status t) + ;; (add-hook '+evil-esc-hook #'anzu--reset-status t) + (add-hook 'iedit-mode-end-hook #'anzu--reset-status)) ;; Keep `doom-modeline-current-window' up-to-date (defvar doom-modeline-current-window (frame-selected-window)) @@ -845,7 +846,8 @@ Requires `anzu', also `evil-anzu' if using `evil-mode' for compatibility with (defsubst doom-modeline--iedit () "Show the number of iedit regions matches + what match you're on." - (when (and (bound-and-true-p iedit-mode) (bound-and-true-p iedit-occurrences-overlays)) + (when (and (bound-and-true-p iedit-mode) + (bound-and-true-p iedit-occurrences-overlays)) (propertize (let ((this-oc (or (let ((inhibit-message t)) (iedit-find-current-occurrence-overlay))