;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
;; Keywords: convenience
-;; Version: 1.3
+;; Version: 1.4
;; 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
: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)
+ (remove-hook 'after-change-functions #'nlinum--after-change t)
(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
+ ;; FIXME: Another approach would be to make the mode permanent-local,
+ ;; which might indeed be preferable.
+ (add-hook 'change-major-mode-hook (lambda () (nlinum-mode -1)))
(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))
+(defun nlinum--face-height (face)
+ (aref (font-info (face-font face)) 2))
+
(defun nlinum--setup-window ()
- (set-window-margins nil (if nlinum-mode nlinum--width)
- (cdr (window-margins))))
+ (let ((width (ceiling
+ ;; We'd really want to check the widths rather than the
+ ;; heights, but it's a start.
+ (/ (* nlinum--width 1.0
+ (nlinum--face-height 'linum))
+ (frame-char-height)))))
+ (set-window-margins nil (if nlinum-mode width)
+ (cdr (window-margins)))))
(defun nlinum--setup-windows ()
(dolist (win (get-buffer-window-list nil nil t))
(defvar nlinum--line-number-cache nil)
(make-variable-buffer-local 'nlinum--line-number-cache)
+;; We could try and avoid flushing the cache at every change, e.g. with:
+;; (defun nlinum--before-change (start _end)
+;; (if (and nlinum--line-number-cache
+;; (< start (car nlinum--line-number-cache)))
+;; (save-excursion (goto-char start) (nlinum--line-number-at-pos))))
+;; But it's far from clear that it's worth the trouble. The current simplistic
+;; approach seems to be good enough in practice.
+
(defun nlinum--after-change (&rest _args)
(setq nlinum--line-number-cache nil))