From: Juanma Barranquero <lekktu@gmail.com>
Date: Tue, 22 Sep 2009 00:06:28 +0000 (+0000)
Subject: * linum.el (linum-delete-overlays, linum-update-window):
X-Git-Tag: emacs-pretest-23.1.90~1209
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=245be23c669af9fa2a241531a74522b5cccc884c;p=emacs.git

* linum.el (linum-delete-overlays, linum-update-window):
  Do not modify the right margin.  (Bug#3971)
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 56328bbad57..b0ecec11bbd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/linum.el b/lisp/linum.el
index 9e0e54a49e1..81b48e99067 100644
--- a/lisp/linum.el
+++ b/lisp/linum.el
@@ -113,7 +113,7 @@ and you have to scroll or press \\[recenter-top-bottom] to update the numbers."
   (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 @@ and you have to scroll or press \\[recenter-top-bottom] to update the numbers."
             (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