(linum-mode): `window-size-change-functions' can now be buffer-local.

(linum-update-window): Use result of `move-overlay'.
author: Martin Rudalics 2008-08-31 08:47:03 +0000
committer: Martin Rudalics 2008-08-31 08:47:03 +0000
commit: 787cb9bac9f95a1ee19a7f32fe1dbb9803606cde (patch)
tree: 8d7bef645c28574ec8f87be970bd87a9c21d44e4
parent: 23dc7615cdba5a0a4a8ac141b973e407966821c6 (diff)
download: emacs-787cb9bac9f95a1ee19a7f32fe1dbb9803606cde.tar.gz
emacs-787cb9bac9f95a1ee19a7f32fe1dbb9803606cde.zip
2 files changed, 202 insertions, 199 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 226e198eacf..28ea7ef3b72 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-30  Markus Triska  <markus.triska@gmx.at>
+        * linum.el (linum-mode): `window-size-change-functions' can now be
+        buffer-local.
+        (linum-update-window): Use result of `move-overlay'.
 2008-08-30  Glenn Morris  <rgm@gnu.org>
        * subr.el (make-variable-frame-local): Tweak obsolescence message.
diff --git a/lisp/linum.el b/lisp/linum.el
index a88bb610d8c..043c9d3420b 100644
--- a/lisp/linum.el
+++ b/lisp/linum.el
@@ -1,199 +1,196 @@
-;;; linum.el --- display line numbers in the left margin
+;;; linum.el --- display line numbers in the left margin
-;; Copyright (C) 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2008 Free Software Foundation, Inc.
-;; Author: Markus Triska <markus.triska@gmx.at>
+;; Author: Markus Triska <markus.triska@gmx.at>
-;; Maintainer: FSF
+;; Maintainer: FSF
-;; Keywords: convenience
+;; Keywords: convenience
-;; This file is part of GNU Emacs.
+;; This file is part of GNU Emacs.
-;; GNU Emacs is free software: you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
+;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
+;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
+;; (at your option) any later version.
-;; GNU Emacs is distributed in the hope that it will be useful,
+;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
+;; GNU General Public License for more details.
-;; You should have received a copy of the GNU General Public License
+;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-;;; Commentary:
+;;; Commentary:
-;; Display line numbers for the current buffer.
+;; Display line numbers for the current buffer.
-;;
+;;
-;; Toggle display of line numbers with M-x linum-mode.  To enable
+;; Toggle display of line numbers with M-x linum-mode.  To enable
-;; line numbering in all buffers, use M-x global-linum-mode.
+;; line numbering in all buffers, use M-x global-linum-mode.
-;;; Code:
+;;; Code:
-(defconst linum-version "0.9wz")
+(defconst linum-version "0.9x")
-(defvar linum-overlays nil "Overlays used in this buffer.")
+(defvar linum-overlays nil "Overlays used in this buffer.")
-(defvar linum-available nil "Overlays available for reuse.")
+(defvar linum-available nil "Overlays available for reuse.")
-(defvar linum-before-numbering-hook nil
+(defvar linum-before-numbering-hook nil
-  "Functions run in each buffer before line numbering starts.")
+  "Functions run in each buffer before line numbering starts.")
-(mapc #'make-variable-buffer-local '(linum-overlays linum-available))
+(mapc #'make-variable-buffer-local '(linum-overlays linum-available))
-(defgroup linum nil
+(defgroup linum nil
-  "Show line numbers in the left margin."
+  "Show line numbers in the left margin."
-  :group 'convenience)
+  :group 'convenience)
-;;;###autoload
+;;;###autoload
-(defcustom linum-format 'dynamic
+(defcustom linum-format 'dynamic
-  "Format used to display line numbers.
+  "Format used to display line numbers.
-Either a format string like \"%7d\", `dynamic' to adapt the width
+Either a format string like \"%7d\", `dynamic' to adapt the width
-as needed, or a function that is called with a line number as its
+as needed, or a function that is called with a line number as its
-argument and should evaluate to a string to be shown on that line.
+argument and should evaluate to a string to be shown on that line.
-See also `linum-before-numbering-hook'."
+See also `linum-before-numbering-hook'."
-  :group 'linum
+  :group 'linum
-  :type 'sexp)
+  :type 'sexp)
-(defface linum
+(defface linum
-  '((t :inherit (shadow default)))
+  '((t :inherit (shadow default)))
-  "Face for displaying line numbers in the display margin."
+  "Face for displaying line numbers in the display margin."
-  :group 'linum)
+  :group 'linum)
-(defcustom linum-eager t
+(defcustom linum-eager t
-  "Whether line numbers should be updated after each command.
+  "Whether line numbers should be updated after each command.
-The conservative setting `nil' might miss some buffer changes,
+The conservative setting `nil' might miss some buffer changes,
-and you have to scroll or press \\[recenter-top-bottom] to update the numbers."
+and you have to scroll or press \\[recenter-top-bottom] to update the numbers."
-  :group 'linum
+  :group 'linum
-  :type 'boolean)
+  :type 'boolean)
-(defcustom linum-delay nil
+(defcustom linum-delay nil
-  "Delay updates to give Emacs a chance for other changes."
+  "Delay updates to give Emacs a chance for other changes."
-  :group 'linum
+  :group 'linum
-  :type 'boolean)
+  :type 'boolean)
-;;;###autoload
+;;;###autoload
-(define-minor-mode linum-mode
+(define-minor-mode linum-mode
-  "Toggle display of line numbers in the left margin."
+  "Toggle display of line numbers in the left margin."
-  :lighter ""                           ; for desktop.el
+  :lighter ""                           ; for desktop.el
-  (if linum-mode
+  (if linum-mode
-      (progn
+      (progn
-        (if linum-eager
+        (if linum-eager
-            (add-hook 'post-command-hook (if linum-delay
+            (add-hook 'post-command-hook (if linum-delay
-                                             'linum-schedule
+                                             'linum-schedule
-                                           'linum-update-current) nil t)
+                                           'linum-update-current) nil t)
-          (add-hook 'after-change-functions 'linum-after-change 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-scroll-functions 'linum-after-scroll nil t)
-        ;; mistake in Emacs: window-size-change-functions cannot be local
+        (add-hook 'window-size-change-functions 'linum-after-size nil t)
-        (add-hook 'window-size-change-functions 'linum-after-size)
+        (add-hook 'change-major-mode-hook 'linum-delete-overlays nil t)
-        (add-hook 'change-major-mode-hook 'linum-delete-overlays nil t)
+        (add-hook 'window-configuration-change-hook
-        (add-hook 'window-configuration-change-hook
+                  'linum-after-config nil t)
-                  'linum-after-config nil t)
+        (linum-update-current))
-        (linum-update-current))
+    (remove-hook 'post-command-hook 'linum-update-current t)
-    (remove-hook 'post-command-hook 'linum-update-current t)
+    (remove-hook 'post-command-hook 'linum-schedule 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)
+    (remove-hook 'window-scroll-functions 'linum-after-scroll t)
-    (remove-hook 'window-scroll-functions 'linum-after-scroll t)
+    (remove-hook 'after-change-functions 'linum-after-change 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-after-config t)
+    (remove-hook 'change-major-mode-hook 'linum-delete-overlays t)
-    (remove-hook 'change-major-mode-hook 'linum-delete-overlays t)
+    (linum-delete-overlays)))
-    (linum-delete-overlays)))
+;;;###autoload
-;;;###autoload
+(define-globalized-minor-mode global-linum-mode linum-mode linum-on)
-(define-globalized-minor-mode global-linum-mode linum-mode linum-on)
+(defun linum-on ()
-(defun linum-on ()
+  (unless (minibufferp)
-  (unless (minibufferp)
+    (linum-mode 1)))
-    (linum-mode 1)))
+(defun linum-delete-overlays ()
-(defun linum-delete-overlays ()
+  "Delete all overlays displaying line numbers for this buffer."
-  "Delete all overlays displaying line numbers for this buffer."
+  (mapc #'delete-overlay linum-overlays)
-  (mapc #'delete-overlay linum-overlays)
+  (setq linum-overlays nil)
-  (setq linum-overlays nil)
+  (dolist (w (get-buffer-window-list (current-buffer) nil t))
-  (dolist (w (get-buffer-window-list (current-buffer) nil t))
+    (set-window-margins w 0)))
-    (set-window-margins w 0)))
+(defun linum-update-current ()
-(defun linum-update-current ()
+  "Update line numbers for the current buffer."
-  "Update line numbers for the current buffer."
+  (linum-update (current-buffer)))
-  (linum-update (current-buffer)))
+(defun linum-update (buffer)
-(defun linum-update (buffer)
+  "Update line numbers for all windows displaying BUFFER."
-  "Update line numbers for all windows displaying BUFFER."
+  (with-current-buffer buffer
-  (with-current-buffer buffer
+    (when linum-mode
-    (when linum-mode
+      (setq linum-available linum-overlays)
-      (setq linum-available linum-overlays)
+      (setq linum-overlays nil)
-      (setq linum-overlays nil)
+      (save-excursion
-      (save-excursion
+        (mapc #'linum-update-window
-        (mapc #'linum-update-window
+              (get-buffer-window-list buffer nil 'visible)))
-              (get-buffer-window-list buffer nil 'visible)))
+      (mapc #'delete-overlay linum-available)
-      (mapc #'delete-overlay linum-available)
+      (setq linum-available nil))))
-      (setq linum-available nil))))
+(defun linum-update-window (win)
-(defun linum-update-window (win)
+  "Update line numbers for the portion visible in window WIN."
-  "Update line numbers for the portion visible in window WIN."
+  (goto-char (window-start win))
-  (goto-char (window-start win))
+  (let ((line (line-number-at-pos))
-  (let ((line (line-number-at-pos))
+        (limit (window-end win t))
-        (limit (window-end win t))
+        (fmt (cond ((stringp linum-format) linum-format)
-        (fmt (cond ((stringp linum-format) linum-format)
+                   ((eq linum-format 'dynamic)
-                   ((eq linum-format 'dynamic)
+                    (let ((w (length (number-to-string
-                    (let ((w (length (number-to-string
+                                      (count-lines (point-min) (point-max))))))
-                                      (count-lines (point-min) (point-max))))))
+                      (concat "%" (number-to-string w) "d")))))
-                      (concat "%" (number-to-string w) "d")))))
+        (width 0))
-        (width 0))
+    (run-hooks 'linum-before-numbering-hook)
-    (run-hooks 'linum-before-numbering-hook)
+    ;; Create an overlay (or reuse an existing one) for each
-    ;; Create an overlay (or reuse an existing one) for each
+    ;; line visible in this window, if necessary.
-    ;; line visible in this window, if necessary.
+    (while (and (not (eobp)) (<= (point) limit))
-    (while (and (not (eobp)) (<= (point) limit))
+      (let* ((str (if fmt
-      (let* ((str (if fmt
+                      (propertize (format fmt line) 'face 'linum)
-                      (propertize (format fmt line) 'face 'linum)
+                    (funcall linum-format line)))
-                    (funcall linum-format line)))
+             (visited (catch 'visited
-             (visited (catch 'visited
+                        (dolist (o (overlays-in (point) (point)))
-                        (dolist (o (overlays-in (point) (point)))
+                          (when (string= (overlay-get o 'linum-str) str)
-                          (when (string= (overlay-get o 'linum-str) str)
+                            (unless (memq o linum-overlays)
-                            (unless (memq o linum-overlays)
+                              (push o linum-overlays))
-                              (push o linum-overlays))
+                            (setq linum-available (delete o linum-available))
-                            (setq linum-available (delete o linum-available))
+                            (throw 'visited t))))))
-                            (throw 'visited t))))))
+        (setq width (max width (length str)))
-        (setq width (max width (length str)))
+        (unless visited
-        (unless visited
+          (let ((ov (if (null linum-available)
-          (let (ov)
+                        (make-overlay (point) (point))
-            (if (null linum-available)
+                      (move-overlay (pop linum-available) (point) (point)))))
-                (setq ov (make-overlay (point) (point)))
+            (push ov linum-overlays)
-              (setq ov (pop linum-available))
+            (overlay-put ov 'before-string
-              (move-overlay ov (point) (point)))
+                         (propertize " " 'display `((margin left-margin) ,str)))
-            (push ov linum-overlays)
+            (overlay-put ov 'linum-str str))))
-            (overlay-put ov 'before-string
+      (forward-line)
-                         (propertize " " 'display `((margin left-margin) ,str)))
+      (setq line (1+ line)))
-            (overlay-put ov 'linum-str str))))
+    (set-window-margins win width)))
-      (forward-line)
-      (setq line (1+ line)))
+(defun linum-after-change (beg end len)
-    (set-window-margins win width)))
+  ;; update overlays on deletions, and after newlines are inserted
+  (when (or (= beg end)
-(defun linum-after-change (beg end len)
+            (= end (point-max))
-  ;; update overlays on deletions, and after newlines are inserted
+            (string-match-p "\n" (buffer-substring-no-properties beg end)))
-  (when (or (= beg end)
+    (linum-update-current)))
-            (= end (point-max))
-            (string-match-p "\n" (buffer-substring-no-properties beg end)))
+(defun linum-after-scroll (win start)
-    (linum-update-current)))
+  (linum-update (window-buffer win)))
-(defun linum-after-scroll (win start)
+(defun linum-after-size (frame)
-  (linum-update (window-buffer win)))
+  (linum-after-config))
-(defun linum-after-size (frame)
+(defun linum-schedule ()
-  (linum-after-config))
+  ;; schedule an update; the delay gives Emacs a chance for display changes
+  (run-with-idle-timer 0 nil #'linum-update-current))
-(defun linum-schedule ()
-  ;; schedule an update; the delay gives Emacs a chance for display changes
+(defun linum-after-config ()
-  (run-with-idle-timer 0 nil #'linum-update-current))
+  (walk-windows (lambda (w) (linum-update (window-buffer w))) nil 'visible))
-(defun linum-after-config ()
+(defun linum-unload-function ()
-  (walk-windows (lambda (w) (linum-update (window-buffer w))) nil 'visible))
+  "Unload the Linum library."
+  (global-linum-mode -1)
-(defun linum-unload-function ()
+  ;; continue standard unloading
-  "Unload the Linum library."
+  nil)
-  (global-linum-mode -1)
-  ;; continue standard unloading
+(provide 'linum)
-  nil)
+;; arch-tag: dea45631-ed3c-4867-8b49-1c41c80aec6a
-(provide 'linum)
+;;; linum.el ends here
-;; arch-tag: dea45631-ed3c-4867-8b49-1c41c80aec6a
-;;; linum.el ends here
author	Martin Rudalics	2008-08-31 08:47:03 +0000
committer	Martin Rudalics	2008-08-31 08:47:03 +0000
commit	787cb9bac9f95a1ee19a7f32fe1dbb9803606cde (patch)
tree	8d7bef645c28574ec8f87be970bd87a9c21d44e4
parent	23dc7615cdba5a0a4a8ac141b973e407966821c6 (diff)
download	emacs-787cb9bac9f95a1ee19a7f32fe1dbb9803606cde.tar.gz emacs-787cb9bac9f95a1ee19a7f32fe1dbb9803606cde.zip

diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 226e198eacf..28ea7ef3b72 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
		1	2008-08-30 Markus Triska <markus.triska@gmx.at>
		2
		3	* linum.el (linum-mode): `window-size-change-functions' can now be
		4	buffer-local.
		5	(linum-update-window): Use result of `move-overlay'.
		6
1	2008-08-30 Glenn Morris <rgm@gnu.org>	7	2008-08-30 Glenn Morris <rgm@gnu.org>
2		8
3	* subr.el (make-variable-frame-local): Tweak obsolescence message.	9	* subr.el (make-variable-frame-local): Tweak obsolescence message.


diff --git a/lisp/linum.el b/lisp/linum.el index a88bb610d8c..043c9d3420b 100644 --- a/lisp/linum.el +++ b/lisp/linum.el
@@ -1,199 +1,196 @@
1	;;; linum.el --- display line numbers in the left margin	1	;;; linum.el --- display line numbers in the left margin
2		2
3	;; Copyright (C) 2008 Free Software Foundation, Inc.	3	;; Copyright (C) 2008 Free Software Foundation, Inc.
4		4
5	;; Author: Markus Triska <markus.triska@gmx.at>	5	;; Author: Markus Triska <markus.triska@gmx.at>
6	;; Maintainer: FSF	6	;; Maintainer: FSF
7	;; Keywords: convenience	7	;; Keywords: convenience
8		8
9	;; This file is part of GNU Emacs.	9	;; This file is part of GNU Emacs.
10		10
11	;; GNU Emacs is free software: you can redistribute it and/or modify	11	;; GNU Emacs is free software: you can redistribute it and/or modify
12	;; it under the terms of the GNU General Public License as published by	12	;; it under the terms of the GNU General Public License as published by
13	;; the Free Software Foundation, either version 3 of the License, or	13	;; the Free Software Foundation, either version 3 of the License, or
14	;; (at your option) any later version.	14	;; (at your option) any later version.
15		15
16	;; GNU Emacs is distributed in the hope that it will be useful,	16	;; GNU Emacs is distributed in the hope that it will be useful,
17	;; but WITHOUT ANY WARRANTY; without even the implied warranty of	17	;; but WITHOUT ANY WARRANTY; without even the implied warranty of
18	;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	18	;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19	;; GNU General Public License for more details.	19	;; GNU General Public License for more details.
20		20
21	;; You should have received a copy of the GNU General Public License	21	;; You should have received a copy of the GNU General Public License
22	;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.	22	;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
23		23
24	;;; Commentary:	24	;;; Commentary:
25		25
26	;; Display line numbers for the current buffer.	26	;; Display line numbers for the current buffer.
27	;;	27	;;
28	;; Toggle display of line numbers with M-x linum-mode. To enable	28	;; Toggle display of line numbers with M-x linum-mode. To enable
29	;; line numbering in all buffers, use M-x global-linum-mode.	29	;; line numbering in all buffers, use M-x global-linum-mode.
30		30
31	;;; Code:	31	;;; Code:
32		32
33	(defconst linum-version "0.9wz")	33	(defconst linum-version "0.9x")
34		34
35	(defvar linum-overlays nil "Overlays used in this buffer.")	35	(defvar linum-overlays nil "Overlays used in this buffer.")
36	(defvar linum-available nil "Overlays available for reuse.")	36	(defvar linum-available nil "Overlays available for reuse.")
37	(defvar linum-before-numbering-hook nil	37	(defvar linum-before-numbering-hook nil
38	"Functions run in each buffer before line numbering starts.")	38	"Functions run in each buffer before line numbering starts.")
39		39
40	(mapc #'make-variable-buffer-local '(linum-overlays linum-available))	40	(mapc #'make-variable-buffer-local '(linum-overlays linum-available))
41		41
42	(defgroup linum nil	42	(defgroup linum nil
43	"Show line numbers in the left margin."	43	"Show line numbers in the left margin."
44	:group 'convenience)	44	:group 'convenience)
45		45
46	;;;###autoload	46	;;;###autoload
47	(defcustom linum-format 'dynamic	47	(defcustom linum-format 'dynamic
48	"Format used to display line numbers.	48	"Format used to display line numbers.
49	Either a format string like \"%7d\", `dynamic' to adapt the width	49	Either a format string like \"%7d\", `dynamic' to adapt the width
50	as needed, or a function that is called with a line number as its	50	as needed, or a function that is called with a line number as its
51	argument and should evaluate to a string to be shown on that line.	51	argument and should evaluate to a string to be shown on that line.
52	See also `linum-before-numbering-hook'."	52	See also `linum-before-numbering-hook'."
53	:group 'linum	53	:group 'linum
54	:type 'sexp)	54	:type 'sexp)
55		55
56	(defface linum	56	(defface linum
57	'((t :inherit (shadow default)))	57	'((t :inherit (shadow default)))
58	"Face for displaying line numbers in the display margin."	58	"Face for displaying line numbers in the display margin."
59	:group 'linum)	59	:group 'linum)
60		60
61	(defcustom linum-eager t	61	(defcustom linum-eager t
62	"Whether line numbers should be updated after each command.	62	"Whether line numbers should be updated after each command.
63	The conservative setting `nil' might miss some buffer changes,	63	The conservative setting `nil' might miss some buffer changes,
64	and you have to scroll or press \\[recenter-top-bottom] to update the numbers."	64	and you have to scroll or press \\[recenter-top-bottom] to update the numbers."
65	:group 'linum	65	:group 'linum
66	:type 'boolean)	66	:type 'boolean)
67		67
68	(defcustom linum-delay nil	68	(defcustom linum-delay nil
69	"Delay updates to give Emacs a chance for other changes."	69	"Delay updates to give Emacs a chance for other changes."
70	:group 'linum	70	:group 'linum
71	:type 'boolean)	71	:type 'boolean)
72		72
73	;;;###autoload	73	;;;###autoload
74	(define-minor-mode linum-mode	74	(define-minor-mode linum-mode
75	"Toggle display of line numbers in the left margin."	75	"Toggle display of line numbers in the left margin."
76	:lighter "" ; for desktop.el	76	:lighter "" ; for desktop.el
77	(if linum-mode	77	(if linum-mode
78	(progn	78	(progn
79	(if linum-eager	79	(if linum-eager
80	(add-hook 'post-command-hook (if linum-delay	80	(add-hook 'post-command-hook (if linum-delay
81	'linum-schedule	81	'linum-schedule
82	'linum-update-current) nil t)	82	'linum-update-current) nil t)
83	(add-hook 'after-change-functions 'linum-after-change nil t))	83	(add-hook 'after-change-functions 'linum-after-change nil t))
84	(add-hook 'window-scroll-functions 'linum-after-scroll nil t)	84	(add-hook 'window-scroll-functions 'linum-after-scroll nil t)
85	;; mistake in Emacs: window-size-change-functions cannot be local	85	(add-hook 'window-size-change-functions 'linum-after-size nil t)
86	(add-hook 'window-size-change-functions 'linum-after-size)	86	(add-hook 'change-major-mode-hook 'linum-delete-overlays nil t)
87	(add-hook 'change-major-mode-hook 'linum-delete-overlays nil t)	87	(add-hook 'window-configuration-change-hook
88	(add-hook 'window-configuration-change-hook	88	'linum-after-config nil t)
89	'linum-after-config nil t)	89	(linum-update-current))
90	(linum-update-current))	90	(remove-hook 'post-command-hook 'linum-update-current t)
91	(remove-hook 'post-command-hook 'linum-update-current t)	91	(remove-hook 'post-command-hook 'linum-schedule t)
92	(remove-hook 'post-command-hook 'linum-schedule t)	92	(remove-hook 'window-size-change-functions 'linum-after-size t)
93	(remove-hook 'window-size-change-functions 'linum-after-size)	93	(remove-hook 'window-scroll-functions 'linum-after-scroll t)
94	(remove-hook 'window-scroll-functions 'linum-after-scroll t)	94	(remove-hook 'after-change-functions 'linum-after-change t)
95	(remove-hook 'after-change-functions 'linum-after-change t)	95	(remove-hook 'window-configuration-change-hook 'linum-after-config t)
96	(remove-hook 'window-configuration-change-hook 'linum-after-config t)	96	(remove-hook 'change-major-mode-hook 'linum-delete-overlays t)
97	(remove-hook 'change-major-mode-hook 'linum-delete-overlays t)	97	(linum-delete-overlays)))
98	(linum-delete-overlays)))	98
99		99	;;;###autoload
100	;;;###autoload	100	(define-globalized-minor-mode global-linum-mode linum-mode linum-on)
101	(define-globalized-minor-mode global-linum-mode linum-mode linum-on)	101
102		102	(defun linum-on ()
103	(defun linum-on ()	103	(unless (minibufferp)
104	(unless (minibufferp)	104	(linum-mode 1)))
105	(linum-mode 1)))	105
106		106	(defun linum-delete-overlays ()
107	(defun linum-delete-overlays ()	107	"Delete all overlays displaying line numbers for this buffer."
108	"Delete all overlays displaying line numbers for this buffer."	108	(mapc #'delete-overlay linum-overlays)
109	(mapc #'delete-overlay linum-overlays)	109	(setq linum-overlays nil)
110	(setq linum-overlays nil)	110	(dolist (w (get-buffer-window-list (current-buffer) nil t))
111	(dolist (w (get-buffer-window-list (current-buffer) nil t))	111	(set-window-margins w 0)))
112	(set-window-margins w 0)))	112
113		113	(defun linum-update-current ()
114	(defun linum-update-current ()	114	"Update line numbers for the current buffer."
115	"Update line numbers for the current buffer."	115	(linum-update (current-buffer)))
116	(linum-update (current-buffer)))	116
117		117	(defun linum-update (buffer)
118	(defun linum-update (buffer)	118	"Update line numbers for all windows displaying BUFFER."
119	"Update line numbers for all windows displaying BUFFER."	119	(with-current-buffer buffer
120	(with-current-buffer buffer	120	(when linum-mode
121	(when linum-mode	121	(setq linum-available linum-overlays)
122	(setq linum-available linum-overlays)	122	(setq linum-overlays nil)
123	(setq linum-overlays nil)	123	(save-excursion
124	(save-excursion	124	(mapc #'linum-update-window
125	(mapc #'linum-update-window	125	(get-buffer-window-list buffer nil 'visible)))
126	(get-buffer-window-list buffer nil 'visible)))	126	(mapc #'delete-overlay linum-available)
127	(mapc #'delete-overlay linum-available)	127	(setq linum-available nil))))
128	(setq linum-available nil))))	128
129		129	(defun linum-update-window (win)
130	(defun linum-update-window (win)	130	"Update line numbers for the portion visible in window WIN."
131	"Update line numbers for the portion visible in window WIN."	131	(goto-char (window-start win))
132	(goto-char (window-start win))	132	(let ((line (line-number-at-pos))
133	(let ((line (line-number-at-pos))	133	(limit (window-end win t))
134	(limit (window-end win t))	134	(fmt (cond ((stringp linum-format) linum-format)
135	(fmt (cond ((stringp linum-format) linum-format)	135	((eq linum-format 'dynamic)
136	((eq linum-format 'dynamic)	136	(let ((w (length (number-to-string
137	(let ((w (length (number-to-string	137	(count-lines (point-min) (point-max))))))
138	(count-lines (point-min) (point-max))))))	138	(concat "%" (number-to-string w) "d")))))
139	(concat "%" (number-to-string w) "d")))))	139	(width 0))
140	(width 0))	140	(run-hooks 'linum-before-numbering-hook)
141	(run-hooks 'linum-before-numbering-hook)	141	;; Create an overlay (or reuse an existing one) for each
142	;; Create an overlay (or reuse an existing one) for each	142	;; line visible in this window, if necessary.
143	;; line visible in this window, if necessary.	143	(while (and (not (eobp)) (<= (point) limit))
144	(while (and (not (eobp)) (<= (point) limit))	144	(let* ((str (if fmt
145	(let* ((str (if fmt	145	(propertize (format fmt line) 'face 'linum)
146	(propertize (format fmt line) 'face 'linum)	146	(funcall linum-format line)))
147	(funcall linum-format line)))	147	(visited (catch 'visited
148	(visited (catch 'visited	148	(dolist (o (overlays-in (point) (point)))
149	(dolist (o (overlays-in (point) (point)))	149	(when (string= (overlay-get o 'linum-str) str)
150	(when (string= (overlay-get o 'linum-str) str)	150	(unless (memq o linum-overlays)
151	(unless (memq o linum-overlays)	151	(push o linum-overlays))
152	(push o linum-overlays))	152	(setq linum-available (delete o linum-available))
153	(setq linum-available (delete o linum-available))	153	(throw 'visited t))))))
154	(throw 'visited t))))))	154	(setq width (max width (length str)))
155	(setq width (max width (length str)))	155	(unless visited
156	(unless visited	156	(let ((ov (if (null linum-available)
157	(let (ov)	157	(make-overlay (point) (point))
158	(if (null linum-available)	158	(move-overlay (pop linum-available) (point) (point)))))
159	(setq ov (make-overlay (point) (point)))	159	(push ov linum-overlays)
160	(setq ov (pop linum-available))	160	(overlay-put ov 'before-string
161	(move-overlay ov (point) (point)))	161	(propertize " " 'display `((margin left-margin) ,str)))
162	(push ov linum-overlays)	162	(overlay-put ov 'linum-str str))))
163	(overlay-put ov 'before-string	163	(forward-line)
164	(propertize " " 'display `((margin left-margin) ,str)))	164	(setq line (1+ line)))
165	(overlay-put ov 'linum-str str))))	165	(set-window-margins win width)))
166	(forward-line)	166
167	(setq line (1+ line)))	167	(defun linum-after-change (beg end len)
168	(set-window-margins win width)))	168	;; update overlays on deletions, and after newlines are inserted
169		169	(when (or (= beg end)
170	(defun linum-after-change (beg end len)	170	(= end (point-max))
171	;; update overlays on deletions, and after newlines are inserted	171	(string-match-p "\n" (buffer-substring-no-properties beg end)))
172	(when (or (= beg end)	172	(linum-update-current)))
173	(= end (point-max))	173
174	(string-match-p "\n" (buffer-substring-no-properties beg end)))	174	(defun linum-after-scroll (win start)
175	(linum-update-current)))	175	(linum-update (window-buffer win)))
176		176
177	(defun linum-after-scroll (win start)	177	(defun linum-after-size (frame)
178	(linum-update (window-buffer win)))	178	(linum-after-config))
179		179
180	(defun linum-after-size (frame)	180	(defun linum-schedule ()
181	(linum-after-config))	181	;; schedule an update; the delay gives Emacs a chance for display changes
182		182	(run-with-idle-timer 0 nil #'linum-update-current))
183	(defun linum-schedule ()	183
184	;; schedule an update; the delay gives Emacs a chance for display changes	184	(defun linum-after-config ()
185	(run-with-idle-timer 0 nil #'linum-update-current))	185	(walk-windows (lambda (w) (linum-update (window-buffer w))) nil 'visible))
186		186
187	(defun linum-after-config ()	187	(defun linum-unload-function ()
188	(walk-windows (lambda (w) (linum-update (window-buffer w))) nil 'visible))	188	"Unload the Linum library."
189		189	(global-linum-mode -1)
190	(defun linum-unload-function ()	190	;; continue standard unloading
191	"Unload the Linum library."	191	nil)
192	(global-linum-mode -1)	192
193	;; continue standard unloading	193	(provide 'linum)
194	nil)	194
195		195	;; arch-tag: dea45631-ed3c-4867-8b49-1c41c80aec6a
196	(provide 'linum)	196	;;; linum.el ends here
197
198	;; arch-tag: dea45631-ed3c-4867-8b49-1c41c80aec6a
199	;;; linum.el ends here