aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Trapuzzano2013-10-27 00:18:28 -0400
committerStefan Monnier2013-10-27 00:18:28 -0400
commitfdab3d0b44d428a13e85b90c022105d13f965ddf (patch)
tree7cb020af0cc07669ba53bb5589061332a9eefeff
parentc8c605ac9ced55d55e952255787c8a6b71bf585a (diff)
downloademacs-fdab3d0b44d428a13e85b90c022105d13f965ddf.tar.gz
emacs-fdab3d0b44d428a13e85b90c022105d13f965ddf.zip
* lisp/linum.el (linum-update-window): Fix boundary test.
Fixes: debbugs:13446
-rw-r--r--etc/NEWS2
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/linum.el2
3 files changed, 6 insertions, 2 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 3d0811abff4..6e18a4343c0 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -216,7 +216,7 @@ You can pick the name of the function and the variables with `C-x 4 a'.
216 216
217* Changes in Specialized Modes and Packages in Emacs 24.4 217* Changes in Specialized Modes and Packages in Emacs 24.4
218 218
219** prolog-use-smie has been remvoed, along with the non-SMIE indentation code. 219** prolog-use-smie has been removed, along with the non-SMIE indentation code.
220 220
221** SMIE indentation can be customized via `smie-config'. 221** SMIE indentation can be customized via `smie-config'.
222The customizaton can be guessed by Emacs by providing a sample indented 222The customizaton can be guessed by Emacs by providing a sample indented
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 96f3ab25172..b70afc81540 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12013-10-27 Nathan Trapuzzano <nbtrap@nbtrap.com>
2
3 * linum.el (linum-update-window): Fix boundary test (bug#13446).
4
12013-10-27 Dmitry Gutov <dgutov@yandex.ru> 52013-10-27 Dmitry Gutov <dgutov@yandex.ru>
2 6
3 * progmodes/ruby-mode.el (ruby-smie--bosp): Anything that goes 7 * progmodes/ruby-mode.el (ruby-smie--bosp): Anything that goes
diff --git a/lisp/linum.el b/lisp/linum.el
index d9d7e5ad120..c2bc2fd91e1 100644
--- a/lisp/linum.el
+++ b/lisp/linum.el
@@ -152,7 +152,7 @@ Linum mode is a buffer-local minor mode."
152 (run-hooks 'linum-before-numbering-hook) 152 (run-hooks 'linum-before-numbering-hook)
153 ;; Create an overlay (or reuse an existing one) for each 153 ;; Create an overlay (or reuse an existing one) for each
154 ;; line visible in this window, if necessary. 154 ;; line visible in this window, if necessary.
155 (while (and (not (eobp)) (<= (point) limit)) 155 (while (and (not (eobp)) (< (point) limit))
156 (let* ((str (if fmt 156 (let* ((str (if fmt
157 (propertize (format fmt line) 'face 'linum) 157 (propertize (format fmt line) 'face 'linum)
158 (funcall linum-format line))) 158 (funcall linum-format line)))