[elpa] master 5de9a5d 24/26: Fix darkroom-tentative-mode when switching window's buffer

[João Távora]

branch: master
commit 5de9a5de7b7aafe16fdb3a59ed723a19eb9afe85
Author: Joao Tavora <address@hidden>
Commit: Joao Tavora <address@hidden>

    Fix darkroom-tentative-mode when switching window's buffer
    
    * darkroom.el (darkroom--enter-or-leave): Call `darkroom-enter'
    with non-nil JUST-MARGINS.
    (darkroom--enter): Add JUST-MARGINS.
---
 darkroom.el |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/darkroom.el b/darkroom.el
index cc98951..1129c53 100644
--- a/darkroom.el
+++ b/darkroom.el
@@ -279,16 +279,18 @@ Alist of (VARIABLE . BEFORE-VALUE)")
 ;; (defvar darkroom--saved-text-scale-mode-amount nil
 ;;   "Text scale before `darkroom-mode' is turned on.")
 
-(defun darkroom--enter ()
-  "Save current state and enter darkroom for the current buffer."
-  (setq darkroom--saved-state
-        (mapcar #'(lambda (sym)
-                    (cons sym (buffer-local-value sym (current-buffer))))
-                darkroom--saved-variables))
-  (setq mode-line-format nil
-        header-line-format nil
-        fringes-outside-margins darkroom-fringes-outside-margins)
-  (text-scale-increase darkroom-text-scale-increase)
+(defun darkroom--enter (&optional just-margins)
+  "Save current state and enter darkroom for the current buffer.
+With optional JUST-MARGINS, just set the margins."
+  (unless just-margins
+    (setq darkroom--saved-state
+          (mapcar #'(lambda (sym)
+                      (cons sym (buffer-local-value sym (current-buffer))))
+                  darkroom--saved-variables))
+    (setq mode-line-format nil
+          header-line-format nil
+          fringes-outside-margins darkroom-fringes-outside-margins)
+    (text-scale-increase darkroom-text-scale-increase))
   (mapc #'(lambda (w)
             (with-selected-window w
               (darkroom--set-margins)))
@@ -309,8 +311,7 @@ Alist of (VARIABLE . BEFORE-VALUE)")
 (defun darkroom--enter-or-leave ()
   "Enter or leave darkroom according to window configuration."
   (cond ((= (count-windows) 1)
-         (unless darkroom--saved-state
-           (darkroom--enter)))
+         (darkroom--enter darkroom--saved-state))
         (darkroom--saved-state
          (darkroom--leave))
         (t