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

Clean up and refactor nlinum defuns

Browse source
This commit is contained in:
Henrik Lissner 2016-04-30 23:13:39 -04:00
parent e796a8478e
commit d80c388f27
2 changed files with 42 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

42
core/core-ui.el
View file

@ -192,48 +192,12 @@
(defvar nlinum-format "%4d ") (defvar nlinum-format "%4d ")
(setq linum-format "%3d ") (setq linum-format "%3d ")
:init :init
(defun narf|nlinum-enable ()
(nlinum-mode +1)
(add-hook 'post-command-hook 'narf|nlinum-hl-line))
(add-hook! (add-hook!
(markdown-mode prog-mode scss-mode web-mode conf-mode) (markdown-mode prog-mode scss-mode web-mode conf-mode)
'narf|nlinum-enable) 'nlinum-mode)
(add-hook! 'nlinum-mode-hook
(add-hook 'post-command-hook 'narf|nlinum-hl-line nil t))
:config :config
(defun narf|nlinum-unhl-line ()
"Unhighlight line number"
(when narf--hl-nlinum-overlay
(let* ((disp (get-text-property
0 'display (overlay-get narf--hl-nlinum-overlay 'before-string)))
(str (nth 1 disp)))
(put-text-property 0 (length str) 'face 'linum str)
(setq narf--hl-nlinum-overlay nil
narf--hl-nlinum-line nil)
disp)))
(defun narf|nlinum-hl-line (&optional line)
"Highlight line number"
(let ((line-no (or line (string-to-number (format-mode-line "%l")))))
(when (and nlinum-mode (not (eq line-no narf--hl-nlinum-line)))
(let* ((pbol (if line
(save-excursion (goto-char (point-min))
(forward-line line-no)
(line-beginning-position))
(line-beginning-position)))
(peol (1+ pbol)))
;; Handle EOF case
(let ((max (point-max)))
(when (>= peol max)
(setq peol max)))
(jit-lock-fontify-now pbol peol)
(let ((ov (-first (lambda (item) (overlay-get item 'nlinum)) (overlays-in pbol peol))))
(when ov
(narf|nlinum-unhl-line)
(let ((str (nth 1 (get-text-property 0 'display (overlay-get ov 'before-string)))))
(put-text-property 0 (length str) 'face 'linum-highlight-face str)
(setq narf--hl-nlinum-overlay ov
narf--hl-nlinum-line line-no))))))))
(add-hook! nlinum-mode (add-hook! nlinum-mode
(setq nlinum--width (setq nlinum--width
(length (save-excursion (goto-char (point-max)) (length (save-excursion (goto-char (point-max))

42
core/defuns/defuns-nlinum.el
View file

@ -9,9 +9,45 @@
;;;###autoload ;;;###autoload
(defun narf|nlinum-disable () (defun narf|nlinum-disable ()
(nlinum-mode -1) (nlinum-mode -1)
(remove-hook 'post-command-hook 'narf|nlinum-hl-line) (remove-hook 'post-command-hook 'narf|nlinum-hl-line t)
(narf|nlinum-unhl-line)) (narf|nlinum-unhl-line))
;;;###autoload
(defun narf|nlinum-unhl-line ()
"Unhighlight line number"
(when narf--hl-nlinum-overlay
(let* ((disp (get-text-property
0 'display (overlay-get narf--hl-nlinum-overlay 'before-string)))
(str (nth 1 disp)))
(put-text-property 0 (length str) 'face 'linum str)
(setq narf--hl-nlinum-overlay nil
narf--hl-nlinum-line nil)
disp)))
;;;###autoload
(defun narf|nlinum-hl-line (&optional line)
"Highlight line number"
(let ((line-no (or line (string-to-number (format-mode-line "%l")))))
(if (and nlinum-mode (not (eq line-no narf--hl-nlinum-line)))
(let* ((pbol (if line
(save-excursion (goto-char 1)
(forward-line line-no)
(line-beginning-position))
(line-beginning-position)))
(peol (1+ pbol))
(max (point-max)))
;; Handle EOF case
(when (>= peol max)
(setq peol max))
(jit-lock-fontify-now pbol peol)
(let ((ov (-first (lambda (item) (overlay-get item 'nlinum)) (overlays-in pbol peol))))
(when ov
(narf|nlinum-unhl-line)
(let ((str (nth 1 (get-text-property 0 'display (overlay-get ov 'before-string)))))
(put-text-property 0 (length str) 'face 'linum-highlight-face str)
(setq narf--hl-nlinum-overlay ov
narf--hl-nlinum-line line-no))))))))
(provide 'defuns-nlinum) (provide 'defuns-nlinum)
;;; defuns-nlinum.el ends here ;;; defuns-nlinum.el ends here