[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/nlinum 5081418 02/20: * nlinum.el: Speed up by caching
From: |
Stefan Monnier |
Subject: |
[elpa] externals/nlinum 5081418 02/20: * nlinum.el: Speed up by caching last line-number. |
Date: |
Sat, 28 Nov 2020 18:42:22 -0500 (EST) |
branch: externals/nlinum
commit 508141804b2a6c3f852ed79d74dcdc323bfc812a
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>
* nlinum.el: Speed up by caching last line-number.
(nlinum--line-number-cache): New var.
(nlinum--after-change, nlinum--line-number-at-pos): New functions.
(nlinum-mode, nlinum--region): Use them.
---
nlinum.el | 29 +++++++++++++++++++++++++++--
1 file changed, 27 insertions(+), 2 deletions(-)
diff --git a/nlinum.el b/nlinum.el
index 0224824..1c9e4e8 100644
--- a/nlinum.el
+++ b/nlinum.el
@@ -4,7 +4,7 @@
;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
;; Keywords: convenience
-;; Version: 1.0
+;; Version: 1.1
;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
@@ -44,11 +44,14 @@ Linum mode is a buffer-local minor mode."
:lighter nil ;; (" NLinum" nlinum--desc)
(jit-lock-unregister #'nlinum--region)
(remove-hook 'window-configuration-change-hook #'nlinum--setup-window t)
+ (remove-hook 'after-change-functions #'nlinum--after-change)
+ (kill-local-variable 'nlinum--line-number-cache)
(remove-overlays (point-min) (point-max) 'nlinum t)
;; (kill-local-variable 'nlinum--ol-counter)
(kill-local-variable 'nlinum--width)
(when nlinum-mode
(add-hook 'window-configuration-change-hook #'nlinum--setup-window nil t)
+ (add-hook 'after-change-functions #'nlinum--after-change nil t)
(jit-lock-register #'nlinum--region t))
(nlinum--setup-windows))
@@ -118,6 +121,28 @@ Linum mode is a buffer-local minor mode."
;; (- debug-count debug-new-count) debug-new-count)))))
+(defvar nlinum--line-number-cache nil)
+(make-variable-buffer-local 'nlinum--line-number-cache)
+
+(defun nlinum--after-change (&rest _args)
+ (setq nlinum--line-number-cache nil))
+
+(defun nlinum--line-number-at-pos ()
+ "Like `line-number-at-pos' but sped up with a cache."
+ ;; (assert (bolp))
+ (let ((pos
+ (if (and nlinum--line-number-cache
+ (> (- (point) (point-min))
+ (abs (- (point) (car nlinum--line-number-cache)))))
+ (funcall (if (> (point) (car nlinum--line-number-cache))
+ #'+ #'-)
+ (cdr nlinum--line-number-cache)
+ (count-lines (point) (car nlinum--line-number-cache)))
+ (line-number-at-pos))))
+ ;;(assert (= pos (line-number-at-pos)))
+ (setq nlinum--line-number-cache (cons (point) pos))
+ pos))
+
(defun nlinum--region (start limit)
(save-excursion
;; Text may contain those nasty intangible properties, but
@@ -126,7 +151,7 @@ Linum mode is a buffer-local minor mode."
(goto-char start)
(unless (bolp) (forward-line 1))
(remove-overlays (point) limit 'nlinum t)
- (let ((line (line-number-at-pos))
+ (let ((line (nlinum--line-number-at-pos))
(fmt (format "%%%dd" nlinum--width)))
(while
(and (not (eobp)) (< (point) limit)
- [elpa] branch externals/nlinum created (now 60d6af0), Stefan Monnier, 2020/11/28
- [elpa] externals/nlinum 37cc4b2 01/20: Add nlinum.el, Stefan Monnier, 2020/11/28
- [elpa] externals/nlinum c64e489 05/20: * packages/nlinum/nlinum.el (nlinum-mode): Don't leave overlays around when, Stefan Monnier, 2020/11/28
- [elpa] externals/nlinum 5081418 02/20: * nlinum.el: Speed up by caching last line-number.,
Stefan Monnier <=
- [elpa] externals/nlinum d7dbf4a 03/20: * nlinum.el: Add global-nlinum-mode and nlinum-format-function., Stefan Monnier, 2020/11/28
- [elpa] externals/nlinum 9a52252 07/20: Fixes: debbugs:17906, Stefan Monnier, 2020/11/28
- [elpa] externals/nlinum 02d3ccf 08/20: * nlinum.el: Use face-width if available. Hook into text-scale-mode, Stefan Monnier, 2020/11/28
- [elpa] externals/nlinum fbe07f1 09/20: * nlinum.el (nlinum--setup-window): Better preserve margin settings, Stefan Monnier, 2020/11/28
- [elpa] externals/nlinum 0ef1df7 10/20: * nlinum.el: Add highlighting of the current line, Stefan Monnier, 2020/11/28
- [elpa] externals/nlinum a4ae169 12/20: nlinum.el: Make it possible to use the right margin, Stefan Monnier, 2020/11/28
- [elpa] externals/nlinum f959610 13/20: * nlinum/nlinum.el: Don't assume nlinum-use-right-margin is fixed, Stefan Monnier, 2020/11/28
- [elpa] externals/nlinum 132ef19 04/20: * nlinum.el (nlinum-format): New custom variable., Stefan Monnier, 2020/11/28
- [elpa] externals/nlinum ba66199 06/20: * packages/nlinum/nlinum.el (nlinum--face-height): New function., Stefan Monnier, 2020/11/28
- [elpa] externals/nlinum 16d30cf 19/20: * packages/nlinum/nlinum.el (nlinum--flush): Widen to really flush all., Stefan Monnier, 2020/11/28