From 97d1addf24d4bdff46cc7123c7a40123fb933e60 Mon Sep 17 00:00:00 2001 From: syl20bnr Date: Fri, 5 Dec 2014 00:59:57 -0500 Subject: [PATCH] Remove unneeded `eval-after-load` in ahs initialization --- spacemacs/packages.el | 128 +++++++++++++++++++++--------------------- 1 file changed, 64 insertions(+), 64 deletions(-) diff --git a/spacemacs/packages.el b/spacemacs/packages.el index 5ea11d40c..18c3ad8b1 100644 --- a/spacemacs/packages.el +++ b/spacemacs/packages.el @@ -335,71 +335,71 @@ which require an initialization must be listed explicitly in the list.") (define-key evil-normal-state-map (kbd "*") 'spacemacs/quick-ahs-forward) (define-key evil-normal-state-map (kbd "#") 'spacemacs/quick-ahs-backward))))) - (eval-after-load "evil-leader" - '(evil-leader/set-key - "se" 'ahs-edit-mode - "sb" 'spacemacs/goto-last-searched-ahs-symbol - "sh" (lambda () (interactive) - (eval '(progn - (ahs-highlight-now) - (setq spacemacs-last-ahs-highlight-p (ahs-highlight-p)) - (spacemacs/auto-highlight-symbol-overlay-map)) nil)) - "sn" (lambda () (interactive) (eval '(progn (ahs-highlight-now) (ahs-forward)) nil)) - "sN" (lambda () (interactive) (eval '(progn (ahs-highlight-now) (ahs-backward)) nil)) - "srb" (lambda () (interactive) (eval '(ahs-change-range 'ahs-range-whole-buffer) nil)) - "srd" (lambda () (interactive) (eval '(ahs-change-range 'ahs-range-display) nil)) - "srf" (lambda () (interactive) (eval '(ahs-change-range 'ahs-range-beginning-of-defun) nil)) - "sR" (lambda () (interactive) (eval '(ahs-change-range ahs-default-range) nil)))) - (spacemacs|hide-lighter auto-highlight-symbol-mode) - ;; micro-state to easily jump from a highlighted symbol to the others - (dolist (sym '(ahs-forward - ahs-forward-definition - ahs-backward - ahs-backward-definition - ahs-back-to-start - ahs-change-range)) - (let* ((advice (intern (format "spacemacs/%s" (symbol-name sym))))) - (eval `(defadvice ,sym (after ,advice activate) - (ahs-highlight-now) - (setq spacemacs-last-ahs-highlight-p (ahs-highlight-p)) - (spacemacs/auto-highlight-symbol-overlay-map))))) - (defun spacemacs/auto-highlight-symbol-overlay-map () - "Set a temporary overlay map to easily jump from highlighted symbols to + (evil-leader/set-key + "se" 'ahs-edit-mode + "sb" 'spacemacs/goto-last-searched-ahs-symbol + "sh" (lambda () (interactive) + (eval '(progn + (ahs-highlight-now) + (setq spacemacs-last-ahs-highlight-p (ahs-highlight-p)) + (spacemacs/auto-highlight-symbol-overlay-map)) nil)) + "sn" (lambda () (interactive) (eval '(progn (ahs-highlight-now) (ahs-forward)) nil)) + "sN" (lambda () (interactive) (eval '(progn (ahs-highlight-now) (ahs-backward)) nil)) + "srb" (lambda () (interactive) (eval '(ahs-change-range 'ahs-range-whole-buffer) nil)) + "srd" (lambda () (interactive) (eval '(ahs-change-range 'ahs-range-display) nil)) + "srf" (lambda () (interactive) (eval '(ahs-change-range 'ahs-range-beginning-of-defun) nil)) + "sR" (lambda () (interactive) (eval '(ahs-change-range ahs-default-range) nil))) + + (spacemacs|hide-lighter auto-highlight-symbol-mode) + ;; micro-state to easily jump from a highlighted symbol to the others + (dolist (sym '(ahs-forward + ahs-forward-definition + ahs-backward + ahs-backward-definition + ahs-back-to-start + ahs-change-range)) + (let* ((advice (intern (format "spacemacs/%s" (symbol-name sym))))) + (eval `(defadvice ,sym (after ,advice activate) + (ahs-highlight-now) + (setq spacemacs-last-ahs-highlight-p (ahs-highlight-p)) + (spacemacs/auto-highlight-symbol-overlay-map))))) + (defun spacemacs/auto-highlight-symbol-overlay-map () + "Set a temporary overlay map to easily jump from highlighted symbols to the nexts." - (interactive) - (set-temporary-overlay-map - (let ((map (make-sparse-keymap))) - (define-key map (kbd "d") 'ahs-forward-definition) - (define-key map (kbd "D") 'ahs-backward-definition) - (define-key map (kbd "e") 'ahs-edit-mode) - (define-key map (kbd "n") 'ahs-forward) - (define-key map (kbd "N") 'ahs-backward) - (define-key map (kbd "R") 'ahs-back-to-start) - (define-key map (kbd "r") (lambda () (interactive) - (eval '(ahs-change-range) nil))) - map) nil) - (let* ((i 0) - (overlay-count (length ahs-overlay-list)) - (overlay (format "%s" (nth i ahs-overlay-list))) - (current-overlay (format "%s" ahs-current-overlay)) - (st (ahs-stat)) - (plighter (ahs-current-plugin-prop 'lighter)) - (plugin (format " <%s> " (cond ((string= plighter "HS") "D") - ((string= plighter "HSA") "B") - ((string= plighter "HSD") "F")))) - (propplugin (propertize plugin 'face `( - :foreground "#ffffff" - :background ,(face-attribute - 'ahs-plugin-defalt-face :foreground))))) - (while (not (string= overlay current-overlay)) - (setq i (1+ i)) - (setq overlay (format "%s" (nth i ahs-overlay-list)))) - (let* ((x/y (format "[%s/%s]" (- overlay-count i) overlay-count)) - (propx/y (propertize x/y 'face ahs-plugin-whole-buffer-face)) - (hidden (if (< 0 (- overlay-count (nth 4 st))) "*" "")) - (prophidden (propertize hidden 'face '(:weight bold)))) - (echo "%s %s%s press (n/N) to navigate, (e) to edit, (r) to change range or (R) for reset" - propplugin propx/y prophidden))))))) + (interactive) + (set-temporary-overlay-map + (let ((map (make-sparse-keymap))) + (define-key map (kbd "d") 'ahs-forward-definition) + (define-key map (kbd "D") 'ahs-backward-definition) + (define-key map (kbd "e") 'ahs-edit-mode) + (define-key map (kbd "n") 'ahs-forward) + (define-key map (kbd "N") 'ahs-backward) + (define-key map (kbd "R") 'ahs-back-to-start) + (define-key map (kbd "r") (lambda () (interactive) + (eval '(ahs-change-range) nil))) + map) nil) + (let* ((i 0) + (overlay-count (length ahs-overlay-list)) + (overlay (format "%s" (nth i ahs-overlay-list))) + (current-overlay (format "%s" ahs-current-overlay)) + (st (ahs-stat)) + (plighter (ahs-current-plugin-prop 'lighter)) + (plugin (format " <%s> " (cond ((string= plighter "HS") "D") + ((string= plighter "HSA") "B") + ((string= plighter "HSD") "F")))) + (propplugin (propertize plugin 'face `( + :foreground "#ffffff" + :background ,(face-attribute + 'ahs-plugin-defalt-face :foreground))))) + (while (not (string= overlay current-overlay)) + (setq i (1+ i)) + (setq overlay (format "%s" (nth i ahs-overlay-list)))) + (let* ((x/y (format "[%s/%s]" (- overlay-count i) overlay-count)) + (propx/y (propertize x/y 'face ahs-plugin-whole-buffer-face)) + (hidden (if (< 0 (- overlay-count (nth 4 st))) "*" "")) + (prophidden (propertize hidden 'face '(:weight bold)))) + (echo "%s %s%s press (n/N) to navigate, (e) to edit, (r) to change range or (R) for reset" + propplugin propx/y prophidden))))))) (defun spacemacs/init-bookmark () (use-package bookmark