annotate lisp/linum.el @ 111540:ca297dbe1d56

Fix last cons in set_wm_state, remove unused variables. * src/xselect.c (x_send_client_event): Remove unused variables cons and size. * src/xterm.c (set_wm_state): Add Qnil to final cons.
author Jan D <jan.h.d@swipnet.se>
date Sun, 14 Nov 2010 11:21:16 +0100
parents a3e1f7134e6e
children 417b1e4d63cd
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
97899
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
1 ;;; linum.el --- display line numbers in the left margin
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
2
106815
1d1d5d9bd884 Add 2010 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 106225
diff changeset
3 ;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
97899
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
4
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
5 ;; Author: Markus Triska <markus.triska@gmx.at>
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
6 ;; Maintainer: FSF
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
7 ;; Keywords: convenience
110016
a3e1f7134e6e Add "Version:" and "Package:" Lisp file headers.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
8 ;; Version: 0.9x
97899
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
9
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
10 ;; This file is part of GNU Emacs.
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
11
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
12 ;; GNU Emacs is free software: you can redistribute it and/or modify
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
13 ;; it under the terms of the GNU General Public License as published by
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
14 ;; the Free Software Foundation, either version 3 of the License, or
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
15 ;; (at your option) any later version.
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
16
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
17 ;; GNU Emacs is distributed in the hope that it will be useful,
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
20 ;; GNU General Public License for more details.
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
21
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
22 ;; You should have received a copy of the GNU General Public License
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
23 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
24
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
25 ;;; Commentary:
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
26
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
27 ;; Display line numbers for the current buffer.
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
28 ;;
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
29 ;; Toggle display of line numbers with M-x linum-mode. To enable
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
30 ;; line numbering in all buffers, use M-x global-linum-mode.
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
31
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
32 ;;; Code:
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
33
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
34 (defconst linum-version "0.9x")
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
35
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
36 (defvar linum-overlays nil "Overlays used in this buffer.")
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
37 (defvar linum-available nil "Overlays available for reuse.")
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
38 (defvar linum-before-numbering-hook nil
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
39 "Functions run in each buffer before line numbering starts.")
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
40
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
41 (mapc #'make-variable-buffer-local '(linum-overlays linum-available))
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
42
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
43 (defgroup linum nil
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
44 "Show line numbers in the left margin."
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
45 :group 'convenience)
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
46
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
47 ;;;###autoload
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
48 (defcustom linum-format 'dynamic
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
49 "Format used to display line numbers.
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
50 Either a format string like \"%7d\", `dynamic' to adapt the width
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
51 as needed, or a function that is called with a line number as its
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
52 argument and should evaluate to a string to be shown on that line.
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
53 See also `linum-before-numbering-hook'."
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
54 :group 'linum
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
55 :type 'sexp)
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
56
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
57 (defface linum
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
58 '((t :inherit (shadow default)))
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
59 "Face for displaying line numbers in the display margin."
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
60 :group 'linum)
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
61
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
62 (defcustom linum-eager t
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
63 "Whether line numbers should be updated after each command.
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
64 The conservative setting `nil' might miss some buffer changes,
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
65 and you have to scroll or press \\[recenter-top-bottom] to update the numbers."
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
66 :group 'linum
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
67 :type 'boolean)
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
68
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
69 (defcustom linum-delay nil
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
70 "Delay updates to give Emacs a chance for other changes."
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
71 :group 'linum
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
72 :type 'boolean)
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
73
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
74 ;;;###autoload
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
75 (define-minor-mode linum-mode
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
76 "Toggle display of line numbers in the left margin."
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
77 :lighter "" ; for desktop.el
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
78 (if linum-mode
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
79 (progn
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
80 (if linum-eager
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
81 (add-hook 'post-command-hook (if linum-delay
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
82 'linum-schedule
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
83 'linum-update-current) nil t)
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
84 (add-hook 'after-change-functions 'linum-after-change nil t))
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
85 (add-hook 'window-scroll-functions 'linum-after-scroll nil t)
104365
fe22bf79af7f (linum-mode): window-size-change-functions is redundant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101274
diff changeset
86 ;; Using both window-size-change-functions and
fe22bf79af7f (linum-mode): window-size-change-functions is redundant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101274
diff changeset
87 ;; window-configuration-change-hook seems redundant. --Stef
fe22bf79af7f (linum-mode): window-size-change-functions is redundant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101274
diff changeset
88 ;; (add-hook 'window-size-change-functions 'linum-after-size nil t)
97899
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
89 (add-hook 'change-major-mode-hook 'linum-delete-overlays nil t)
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
90 (add-hook 'window-configuration-change-hook
104365
fe22bf79af7f (linum-mode): window-size-change-functions is redundant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101274
diff changeset
91 ;; FIXME: If the buffer is shown in N windows, this
fe22bf79af7f (linum-mode): window-size-change-functions is redundant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101274
diff changeset
92 ;; will be called N times rather than once. We should use
fe22bf79af7f (linum-mode): window-size-change-functions is redundant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101274
diff changeset
93 ;; something like linum-update-window instead.
fe22bf79af7f (linum-mode): window-size-change-functions is redundant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101274
diff changeset
94 'linum-update-current nil t)
97899
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
95 (linum-update-current))
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
96 (remove-hook 'post-command-hook 'linum-update-current t)
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
97 (remove-hook 'post-command-hook 'linum-schedule t)
104365
fe22bf79af7f (linum-mode): window-size-change-functions is redundant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101274
diff changeset
98 ;; (remove-hook 'window-size-change-functions 'linum-after-size t)
97899
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
99 (remove-hook 'window-scroll-functions 'linum-after-scroll t)
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
100 (remove-hook 'after-change-functions 'linum-after-change t)
104365
fe22bf79af7f (linum-mode): window-size-change-functions is redundant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101274
diff changeset
101 (remove-hook 'window-configuration-change-hook 'linum-update-current t)
97899
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
102 (remove-hook 'change-major-mode-hook 'linum-delete-overlays t)
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
103 (linum-delete-overlays)))
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
104
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
105 ;;;###autoload
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
106 (define-globalized-minor-mode global-linum-mode linum-mode linum-on)
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
107
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
108 (defun linum-on ()
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
109 (unless (minibufferp)
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
110 (linum-mode 1)))
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
111
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
112 (defun linum-delete-overlays ()
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
113 "Delete all overlays displaying line numbers for this buffer."
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
114 (mapc #'delete-overlay linum-overlays)
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
115 (setq linum-overlays nil)
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
116 (dolist (w (get-buffer-window-list (current-buffer) nil t))
105135
708c5f10a0be * linum.el (linum-delete-overlays, linum-update-window):
Juanma Barranquero <lekktu@gmail.com>
parents: 104365
diff changeset
117 (set-window-margins w 0 (cdr (window-margins w)))))
97899
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
118
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
119 (defun linum-update-current ()
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
120 "Update line numbers for the current buffer."
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
121 (linum-update (current-buffer)))
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
122
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
123 (defun linum-update (buffer)
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
124 "Update line numbers for all windows displaying BUFFER."
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
125 (with-current-buffer buffer
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
126 (when linum-mode
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
127 (setq linum-available linum-overlays)
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
128 (setq linum-overlays nil)
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
129 (save-excursion
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
130 (mapc #'linum-update-window
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
131 (get-buffer-window-list buffer nil 'visible)))
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
132 (mapc #'delete-overlay linum-available)
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
133 (setq linum-available nil))))
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
134
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
135 (defun linum-update-window (win)
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
136 "Update line numbers for the portion visible in window WIN."
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
137 (goto-char (window-start win))
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
138 (let ((line (line-number-at-pos))
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
139 (limit (window-end win t))
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
140 (fmt (cond ((stringp linum-format) linum-format)
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
141 ((eq linum-format 'dynamic)
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
142 (let ((w (length (number-to-string
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
143 (count-lines (point-min) (point-max))))))
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
144 (concat "%" (number-to-string w) "d")))))
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
145 (width 0))
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
146 (run-hooks 'linum-before-numbering-hook)
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
147 ;; Create an overlay (or reuse an existing one) for each
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
148 ;; line visible in this window, if necessary.
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
149 (while (and (not (eobp)) (<= (point) limit))
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
150 (let* ((str (if fmt
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
151 (propertize (format fmt line) 'face 'linum)
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
152 (funcall linum-format line)))
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
153 (visited (catch 'visited
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
154 (dolist (o (overlays-in (point) (point)))
101274
4bcf5c96d5ee * linum.el (linum-update-window): Use `delq' instead of `delete';
Juanma Barranquero <lekktu@gmail.com>
parents: 100908
diff changeset
155 (when (equal-including-properties
4bcf5c96d5ee * linum.el (linum-update-window): Use `delq' instead of `delete';
Juanma Barranquero <lekktu@gmail.com>
parents: 100908
diff changeset
156 (overlay-get o 'linum-str) str)
97899
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
157 (unless (memq o linum-overlays)
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
158 (push o linum-overlays))
101274
4bcf5c96d5ee * linum.el (linum-update-window): Use `delq' instead of `delete';
Juanma Barranquero <lekktu@gmail.com>
parents: 100908
diff changeset
159 (setq linum-available (delq o linum-available))
97899
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
160 (throw 'visited t))))))
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
161 (setq width (max width (length str)))
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
162 (unless visited
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
163 (let ((ov (if (null linum-available)
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
164 (make-overlay (point) (point))
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
165 (move-overlay (pop linum-available) (point) (point)))))
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
166 (push ov linum-overlays)
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
167 (overlay-put ov 'before-string
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
168 (propertize " " 'display `((margin left-margin) ,str)))
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
169 (overlay-put ov 'linum-str str))))
106225
5418676a97db (linum-update-window): Ignore intangible (bug#4996).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105135
diff changeset
170 ;; Text may contain those nasty intangible properties, but that
5418676a97db (linum-update-window): Ignore intangible (bug#4996).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105135
diff changeset
171 ;; shouldn't prevent us from counting those lines.
5418676a97db (linum-update-window): Ignore intangible (bug#4996).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105135
diff changeset
172 (let ((inhibit-point-motion-hooks t))
5418676a97db (linum-update-window): Ignore intangible (bug#4996).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105135
diff changeset
173 (forward-line))
97899
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
174 (setq line (1+ line)))
105135
708c5f10a0be * linum.el (linum-delete-overlays, linum-update-window):
Juanma Barranquero <lekktu@gmail.com>
parents: 104365
diff changeset
175 (set-window-margins win width (cdr (window-margins win)))))
97899
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
176
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
177 (defun linum-after-change (beg end len)
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
178 ;; update overlays on deletions, and after newlines are inserted
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
179 (when (or (= beg end)
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
180 (= end (point-max))
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
181 (string-match-p "\n" (buffer-substring-no-properties beg end)))
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
182 (linum-update-current)))
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
183
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
184 (defun linum-after-scroll (win start)
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
185 (linum-update (window-buffer win)))
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
186
104365
fe22bf79af7f (linum-mode): window-size-change-functions is redundant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101274
diff changeset
187 ;; (defun linum-after-size (frame)
fe22bf79af7f (linum-mode): window-size-change-functions is redundant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101274
diff changeset
188 ;; (linum-after-config))
97899
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
189
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
190 (defun linum-schedule ()
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
191 ;; schedule an update; the delay gives Emacs a chance for display changes
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
192 (run-with-idle-timer 0 nil #'linum-update-current))
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
193
104365
fe22bf79af7f (linum-mode): window-size-change-functions is redundant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101274
diff changeset
194 ;; (defun linum-after-config ()
fe22bf79af7f (linum-mode): window-size-change-functions is redundant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101274
diff changeset
195 ;; (walk-windows (lambda (w) (linum-update (window-buffer w))) nil 'visible))
97899
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
196
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
197 (defun linum-unload-function ()
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
198 "Unload the Linum library."
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
199 (global-linum-mode -1)
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
200 ;; continue standard unloading
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
201 nil)
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
202
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
203 (provide 'linum)
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
204
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
205 ;; arch-tag: dea45631-ed3c-4867-8b49-1c41c80aec6a
92d8f6972f8a Fix EOL mishap.
Juanma Barranquero <lekktu@gmail.com>
parents: 97895
diff changeset
206 ;;; linum.el ends here