From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 24 Nov 2009 22:28:01 +0000 (+0000)
Subject: (linum-update-window): Ignore intangible (bug#4996).
X-Git-Tag: emacs-pretest-23.1.90~244
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d204c46c611f765886f1079d1a93865ba2beacbb;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f44529c9bc0..b56f64a5b79 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/linum.el b/lisp/linum.el
index 81b48e99067..a73003b4570 100644
--- a/lisp/linum.el
+++ b/lisp/linum.el
@@ -166,7 +166,10 @@ and you have to scroll or press \\[recenter-top-bottom] to update the numbers."
             (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)))))