[Emacs-diffs] Changes to emacs/lisp/linum.el,v

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/08/26 20:50:01

Index: linum.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/linum.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- linum.el    6 May 2008 07:57:42 -0000       1.6
+++ linum.el    26 Aug 2008 20:50:01 -0000      1.7
@@ -30,7 +30,7 @@
 
 ;;; Code:
 
-(defconst linum-version "0.9wx")
+(defconst linum-version "0.9wz")
 
 (defvar linum-overlays nil "Overlays used in this buffer.")
 (defvar linum-available nil "Overlays available for reuse.")
@@ -54,7 +54,7 @@
   :type 'sexp)
 
 (defface linum
-  '((t :inherit shadow))
+  '((t :inherit (shadow default)))
   "Face for displaying line numbers in the display margin."
   :group 'linum)
 
@@ -65,7 +65,7 @@
   :group 'linum
   :type 'boolean)
 
-(defcustom linum-delay t
+(defcustom linum-delay nil
   "Delay updates to give Emacs a chance for other changes."
   :group 'linum
   :type 'boolean)
@@ -131,39 +131,38 @@
   "Update line numbers for the portion visible in window WIN."
   (goto-char (window-start win))
   (let ((line (line-number-at-pos))
-        (limit (1+ (window-end win t)))
+        (limit (window-end win t))
         (fmt (cond ((stringp linum-format) linum-format)
                    ((eq linum-format 'dynamic)
                     (let ((w (length (number-to-string
                                       (count-lines (point-min) (point-max))))))
                       (concat "%" (number-to-string w) "d")))))
-        (width 0)
-        visited
-        ov)
+        (width 0))
     (run-hooks 'linum-before-numbering-hook)
     ;; Create an overlay (or reuse an existing one) for each
     ;; line visible in this window, if necessary.
-    (while (and (not (eobp)) (< (point) limit))
-      (setq visited nil)
+    (while (and (not (eobp)) (<= (point) limit))
+      (let* ((str (if fmt
+                      (propertize (format fmt line) 'face 'linum)
+                    (funcall linum-format line)))
+             (visited (catch 'visited
       (dolist (o (overlays-in (point) (point)))
-        (when (eq (overlay-get o 'linum-line) line)
+                          (when (string= (overlay-get o 'linum-str) str)
           (unless (memq o linum-overlays)
             (push o linum-overlays))
           (setq linum-available (delete o linum-available))
-          (setq visited t)))
-      (let ((str (if fmt
-                     (propertize (format fmt line) 'face 'linum)
-                   (funcall linum-format line))))
+                            (throw 'visited t))))))
         (setq width (max width (length str)))
         (unless visited
+          (let (ov)
           (if (null linum-available)
               (setq ov (make-overlay (point) (point)))
             (setq ov (pop linum-available))
             (move-overlay ov (point) (point)))
           (push ov linum-overlays)
-          (setq str (propertize " " 'display `((margin left-margin) ,str)))
-          (overlay-put ov 'before-string str)
-          (overlay-put ov 'linum-line line)))
+            (overlay-put ov 'before-string
+                         (propertize " " 'display `((margin left-margin) 
,str)))
+            (overlay-put ov 'linum-str str))))
       (forward-line)
       (setq line (1+ line)))
     (set-window-margins win width)))