# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1253577988 0
# Node ID 708c5f10a0be5450af49ce17e99f063248830aa2
# Parent  c0874098bd627d9a481ce53f0fc6efada336c4ea
* linum.el (linum-delete-overlays, linum-update-window):
  Do not modify the right margin.  (Bug#3971)

diff -r c0874098bd62 -r 708c5f10a0be lisp/ChangeLog
--- 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
diff -r c0874098bd62 -r 708c5f10a0be lisp/linum.el
--- 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