diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-11-24 22:28:01 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-11-24 22:28:01 +0000 |
| commit | d204c46c611f765886f1079d1a93865ba2beacbb (patch) | |
| tree | 492f1c64586578e7d5be5c16f5de6099413d78c6 /lisp | |
| parent | 449c27f045b0b49f3edf2cf3f598d4d1879850fb (diff) | |
| download | emacs-d204c46c611f765886f1079d1a93865ba2beacbb.tar.gz emacs-d204c46c611f765886f1079d1a93865ba2beacbb.tar.bz2 emacs-d204c46c611f765886f1079d1a93865ba2beacbb.zip | |
(linum-update-window): Ignore intangible (bug#4996).
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/linum.el | 5 |
2 files changed, 8 insertions, 1 deletions
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))))) |