changeset 105135:708c5f10a0be

* linum.el (linum-delete-overlays, linum-update-window): Do not modify the right margin. (Bug#3971)
author Juanma Barranquero <lekktu@gmail.com>
date Tue, 22 Sep 2009 00:06:28 +0000
parents c0874098bd62
children efbb3447451f
files lisp/ChangeLog lisp/linum.el
diffstat 2 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Mon Sep 21 22:12:28 2009 +0000
+++ b/lisp/ChangeLog	Tue Sep 22 00:06:28 2009 +0000
@@ -1,3 +1,8 @@
+2009-09-22  Lennart Borgman  <lennart.borgman@gmail.com>
+
+	* linum.el (linum-delete-overlays, linum-update-window):
+	Do not modify the right margin.  (Bug#3971)
+
 2009-09-21  Chong Yidong  <cyd@stupidchicken.com>
 
 	* files.el (conf-mode-maybe, magic-fallback-mode-alist): Use
--- a/lisp/linum.el	Mon Sep 21 22:12:28 2009 +0000
+++ b/lisp/linum.el	Tue Sep 22 00:06:28 2009 +0000
@@ -113,7 +113,7 @@
   (mapc #'delete-overlay linum-overlays)
   (setq linum-overlays nil)
   (dolist (w (get-buffer-window-list (current-buffer) nil t))
-    (set-window-margins w 0)))
+    (set-window-margins w 0 (cdr (window-margins w)))))
 
 (defun linum-update-current ()
   "Update line numbers for the current buffer."
@@ -168,7 +168,7 @@
             (overlay-put ov 'linum-str str))))
       (forward-line)
       (setq line (1+ line)))
-    (set-window-margins win width)))
+    (set-window-margins win width (cdr (window-margins win)))))
 
 (defun linum-after-change (beg end len)
   ;; update overlays on deletions, and after newlines are inserted