[Emacs-diffs] emacs/lisp ChangeLog linum.el

[Juanma Barranquero]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      09/09/22 00:06:31

Modified files:
        lisp           : ChangeLog linum.el 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16226&r2=1.16227
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/linum.el?cvsroot=emacs&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16226
retrieving revision 1.16227
diff -u -b -r1.16226 -r1.16227
--- ChangeLog   21 Sep 2009 22:12:28 -0000      1.16226
+++ ChangeLog   22 Sep 2009 00:06:28 -0000      1.16227
@@ -1,3 +1,8 @@
+2009-09-22  Lennart Borgman  <address@hidden>
+
+       * linum.el (linum-delete-overlays, linum-update-window):
+       Do not modify the right margin.  (Bug#3971)
+
 2009-09-21  Chong Yidong  <address@hidden>
 
        * files.el (conf-mode-maybe, magic-fallback-mode-alist): Use

Index: linum.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/linum.el,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- linum.el    19 Aug 2009 17:28:58 -0000      1.12
+++ linum.el    22 Sep 2009 00:06:31 -0000      1.13
@@ -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