[Emacs-diffs] emacs/lisp ChangeLog linum.el

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/11/24 22:28:04

Modified files:
        lisp           : ChangeLog linum.el 

Log message:
        (linum-update-window): Ignore intangible (bug#4996).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16720&r2=1.16721
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/linum.el?cvsroot=emacs&r1=1.13&r2=1.14

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16720
retrieving revision 1.16721
diff -u -b -r1.16720 -r1.16721
--- ChangeLog   24 Nov 2009 22:23:49 -0000      1.16720
+++ ChangeLog   24 Nov 2009 22:28:01 -0000      1.16721
@@ -1,3 +1,7 @@
+2009-11-24  Markus Triska  <address@hidden>
+
+       * linum.el (linum-update-window): Ignore intangible (bug#4996).
+
 2009-11-24  Stefan Monnier  <address@hidden>
 
        Handle the [back] button properly (bug#4979).

Index: linum.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/linum.el,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- linum.el    22 Sep 2009 00:06:31 -0000      1.13
+++ linum.el    24 Nov 2009 22:28:04 -0000      1.14
@@ -166,7 +166,10 @@
             (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 (cdr (window-margins win)))))