;;; linum.el --- display line numbers in the left margin
-;; Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
;; Author: Markus Triska <markus.triska@gmx.at>
;; Maintainer: FSF
'linum-update-current) nil t)
(add-hook 'after-change-functions 'linum-after-change nil t))
(add-hook 'window-scroll-functions 'linum-after-scroll nil t)
- (add-hook 'window-size-change-functions 'linum-after-size nil t)
+ ;; Using both window-size-change-functions and
+ ;; window-configuration-change-hook seems redundant. --Stef
+ ;; (add-hook 'window-size-change-functions 'linum-after-size nil t)
(add-hook 'change-major-mode-hook 'linum-delete-overlays nil t)
(add-hook 'window-configuration-change-hook
- 'linum-after-config nil t)
+ ;; FIXME: If the buffer is shown in N windows, this
+ ;; will be called N times rather than once. We should use
+ ;; something like linum-update-window instead.
+ 'linum-update-current nil t)
(linum-update-current))
(remove-hook 'post-command-hook 'linum-update-current t)
(remove-hook 'post-command-hook 'linum-schedule t)
- (remove-hook 'window-size-change-functions 'linum-after-size t)
+ ;; (remove-hook 'window-size-change-functions 'linum-after-size t)
(remove-hook 'window-scroll-functions 'linum-after-scroll t)
(remove-hook 'after-change-functions 'linum-after-change t)
- (remove-hook 'window-configuration-change-hook 'linum-after-config t)
+ (remove-hook 'window-configuration-change-hook 'linum-update-current t)
(remove-hook 'change-major-mode-hook 'linum-delete-overlays t)
(linum-delete-overlays)))
(mapc #'delete-overlay linum-overlays)
(setq linum-overlays nil)
(dolist (w (get-buffer-window-list (current-buffer) nil t))
- (set-window-margins w 0)))
+ (set-window-margins w 0 (cdr (window-margins w)))))
(defun linum-update-current ()
"Update line numbers for the current buffer."
(funcall linum-format line)))
(visited (catch 'visited
(dolist (o (overlays-in (point) (point)))
- (when (string= (overlay-get o 'linum-str) str)
+ (when (equal-including-properties
+ (overlay-get o 'linum-str) str)
(unless (memq o linum-overlays)
(push o linum-overlays))
- (setq linum-available (delete o linum-available))
+ (setq linum-available (delq o linum-available))
(throw 'visited t))))))
(setq width (max width (length str)))
(unless visited
(overlay-put ov 'before-string
(propertize " " 'display `((margin left-margin) ,str)))
(overlay-put ov 'linum-str str))))
- (forward-line)
+ ;; Text may contain those nasty intangible properties, but that
+ ;; shouldn't prevent us from counting those lines.
+ (let ((inhibit-point-motion-hooks t))
+ (forward-line))
(setq line (1+ line)))
- (set-window-margins win width)))
+ (set-window-margins win width (cdr (window-margins win)))))
(defun linum-after-change (beg end len)
;; update overlays on deletions, and after newlines are inserted
(defun linum-after-scroll (win start)
(linum-update (window-buffer win)))
-(defun linum-after-size (frame)
- (linum-after-config))
+;; (defun linum-after-size (frame)
+;; (linum-after-config))
(defun linum-schedule ()
;; schedule an update; the delay gives Emacs a chance for display changes
(run-with-idle-timer 0 nil #'linum-update-current))
-(defun linum-after-config ()
- (walk-windows (lambda (w) (linum-update (window-buffer w))) nil 'visible))
+;; (defun linum-after-config ()
+;; (walk-windows (lambda (w) (linum-update (window-buffer w))) nil 'visible))
(defun linum-unload-function ()
"Unload the Linum library."