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

ui/nav-flash: fix wrong-type-argument error on recenter

Browse source
This commit is contained in:
Henrik Lissner 2018-03-26 02:11:08 -04:00
parent 7f6fb69a3d
commit b848527f0c
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

18
modules/ui/nav-flash/autoload.el
View file

@ -1,19 +1,19 @@
;;; ui/nav-flash/autoload.el -*- lexical-binding: t; -*-
;;;###autoload
(defun +doom*blink-cursor-maybe (orig-fn &rest args)
(defun +nav-flash*blink-cursor-maybe (orig-fn &rest args)
"Blink current line if the window has moved."
(let ((point (save-excursion (goto-char (window-start))
(point-marker))))
(if (or (not (window-start))
(derived-mode-p 'term-mode))
(apply orig-fn args)
(unless (or (derived-mode-p 'term-mode)
(equal point
(save-excursion (goto-char (window-start))
(point-marker))))
(+doom/blink-cursor))))
(let* ((win-beg (window-start))
(point (save-excursion (goto-char win-beg) (point-marker))))
(apply orig-fn args)
(unless (equal point (save-excursion (goto-char win-beg) (point-marker)))
(+nav-flash/blink-cursor)))))
;;;###autoload
(defun +doom/blink-cursor (&rest _)
(defun +nav-flash/blink-cursor (&rest _)
"Blink current line using `nav-flash'."
(interactive)
(unless (minibufferp)

14
modules/ui/nav-flash/config.el
View file

@ -5,16 +5,16 @@
:init
;; NOTE In :feature jump `recenter' is hooked to a bunch of jumping commands,
;; which will trigger nav-flash.
(advice-add #'windmove-do-window-select :around #'+doom*blink-cursor-maybe)
(advice-add #'recenter :around #'+doom*blink-cursor-maybe)
(add-hook 'doom-after-switch-window-hook #'+nav-flash/blink-cursor)
(advice-add #'recenter :around #'+nav-flash*blink-cursor-maybe)
(advice-add #'save-place-find-file-hook :after #'+doom/blink-cursor)
(advice-add #'save-place-find-file-hook :after #'+nav-flash/blink-cursor)
(after! evil
(advice-add #'evil--jumps-jump :after #'+doom/blink-cursor)
(advice-add #'evil--jumps-jump :after #'+nav-flash/blink-cursor)
(advice-add #'evil-window-top :after #'+doom/blink-cursor)
(advice-add #'evil-window-middle :after #'+doom/blink-cursor)
(advice-add #'evil-window-bottom :after #'+doom/blink-cursor)))
(advice-add #'evil-window-top :after #'+nav-flash/blink-cursor)
(advice-add #'evil-window-middle :after #'+nav-flash/blink-cursor)
(advice-add #'evil-window-bottom :after #'+nav-flash/blink-cursor)))