# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1259101681 0
# Node ID 5418676a97db045855b5e1e1bdf8f5931bd371a0
# Parent  647b4d3925579f58606c371d03e800e1fe21b054
(linum-update-window): Ignore intangible (bug#4996).

diff -r 647b4d392557 -r 5418676a97db lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Nov 24 22:23:49 2009 +0000
+++ b/lisp/ChangeLog	Tue Nov 24 22:28:01 2009 +0000
@@ -1,3 +1,7 @@
+2009-11-24  Markus Triska  <markus.triska@gmx.at>
+
+	* linum.el (linum-update-window): Ignore intangible (bug#4996).
+
 2009-11-24  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	Handle the [back] button properly (bug#4979).
diff -r 647b4d392557 -r 5418676a97db lisp/linum.el
--- a/lisp/linum.el	Tue Nov 24 22:23:49 2009 +0000
+++ b/lisp/linum.el	Tue Nov 24 22:28:01 2009 +0000
@@ -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)))))