[elpa] master b629c75 2/2: * nlinum/nlinum.el: Don't assume nlinum-use-right-margin is fixed

[Stefan Monnier]

branch: master
commit b629c75df37528fdece56aa65badf6e5fadef202
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>

    * nlinum/nlinum.el: Don't assume nlinum-use-right-margin is fixed
    
    (nlinum--using-right-margin): New var.
    (nlinum-mode): Copy nlinum-use-right-margin to nlinum--using-right-margin.
    (nlinum--setup-window): Use the new var.
---
 packages/nlinum/nlinum.el | 36 +++++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/packages/nlinum/nlinum.el b/packages/nlinum/nlinum.el
index aef2d81..d0ab821 100644
--- a/packages/nlinum/nlinum.el
+++ b/packages/nlinum/nlinum.el
@@ -4,7 +4,7 @@
 
 ;; Author: Stefan Monnier <address@hidden>
 ;; Keywords: convenience
-;; Version: 1.7
+;; Version: 1.8
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -26,6 +26,9 @@
 
 ;;; News:
 
+;; v1.8:
+;; - Add `nlinum-use-right-margin'.
+
 ;; v1.7:
 ;; - Add ability to highlight current line number.
 ;; - New custom variable `nlinum-highlight-current-line' and
@@ -70,11 +73,14 @@ face."
 (make-variable-buffer-local 'nlinum--current-line)
 
 (defcustom nlinum-use-right-margin nil
-  "Use the left (nil) or right (t) margin."
+  "If non-nil, put line numbers in the right margin instead of the left one."
   :type 'boolean)
 
 ;; (defvar nlinum--desc "")
 
+(defvar nlinum--using-right-margin nil)
+(make-variable-buffer-local 'nlinum--using-right-margin)
+
 ;;;###autoload
 (define-minor-mode nlinum-mode
   "Toggle display of line numbers in the left margin (Linum mode).
@@ -93,6 +99,12 @@ Linum mode is a buffer-local minor mode."
   (remove-overlays (point-min) (point-max) 'nlinum t)
   ;; (kill-local-variable 'nlinum--ol-counter)
   (kill-local-variable 'nlinum--width)
+  (when (and (local-variable-p 'nlinum--using-right-margin)
+             (not (eq nlinum--using-right-margin nlinum-use-right-margin)))
+    ;; Remove outdated margins as well as margin annotations.
+    (let ((nlinum-mode nil)) (nlinum--flush))
+    (kill-local-variable 'nlinum--using-right-margin))
+  (setq nlinum--using-right-margin nlinum-use-right-margin)
   (when nlinum-mode
     ;; FIXME: Another approach would be to make the mode permanent-local,
     ;; which might indeed be preferable.
@@ -132,7 +144,8 @@ Linum mode is a buffer-local minor mode."
                             (frame-char-height)))))
                   nlinum--width))
          (cur-margins (window-margins))
-         (cur-margin (if nlinum-use-right-margin (cdr cur-margins) (car 
cur-margins)))
+         (cur-margin (if nlinum--using-right-margin
+                         (cdr cur-margins) (car cur-margins)))
          ;; (EXT . OURS) keeps track of the size of the margin, where EXT is 
the
          ;; size chosen by external code and OURS is the size we last set.
          ;; OURS is used to detect when someone else modifies the margin.
@@ -146,11 +159,11 @@ Linum mode is a buffer-local minor mode."
     (and (car margin-settings) width
          (setq width (max width (car margin-settings))))
     (setcdr margin-settings width)
-    ;; even more changes!
-    (if nlinum-use-right-margin
-        (set-window-margins nil (car cur-margins) (if nlinum-mode width (car 
margin-settings)))
-      (set-window-margins nil (if nlinum-mode width (car margin-settings))
-                          (cdr cur-margins)))))
+    (apply #'set-window-margins nil
+           (let ((new-margin (if nlinum-mode width (car margin-settings))))
+           (if nlinum--using-right-margin
+               (list (car cur-margins) new-margin)
+             (list new-margin (cdr cur-margins)))))))
 
 (defun nlinum--setup-windows ()
   (dolist (win (get-buffer-window-list nil nil t))
@@ -314,7 +327,9 @@ it may cause the margin to be resized and line numbers to 
be recomputed.")
                  (let* ((ol (make-overlay (point) (1+ (point))))
                         (str (funcall nlinum-format-function
                                       line nlinum--width))
-                        (width (string-width str)))
+                        (width (string-width str))
+                        (margin (if nlinum--using-right-margin
+                                    'right-margin 'left-margin)))
                    (when (< nlinum--width width)
                      (setq nlinum--width width)
                      (nlinum--flush))
@@ -322,8 +337,7 @@ it may cause the margin to be resized and line numbers to 
be recomputed.")
                    (overlay-put ol 'evaporate t)
                    (overlay-put ol 'before-string
                                 (propertize " " 'display
-                                            `((margin ,(if 
nlinum-use-right-margin 'right-margin 'left-margin)) ,str)))
-                                            ;;`((margin right-margin) ,str)))
+                                            `((margin ,margin) ,str)))
                    ;; (setq nlinum--ol-counter (1- nlinum--ol-counter))
                    ;; (when (= nlinum--ol-counter 0)
                    ;;   (run-with-idle-timer 0.5 nil #'nlinum--flush-overlays