[nongnu] elpa/visual-fill-column 3bfeefa365 094/137: Use min-margins window parameter.

[ELPA Syncer]

branch: elpa/visual-fill-column
commit 3bfeefa365876c7602eb1a571a2412d1e5329457
Author: Joost Kremers <joostkremers@fastmail.fm>
Commit: Joost Kremers <joostkremers@fastmail.fm>

    Use min-margins window parameter.
---
 visual-fill-column.el | 26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/visual-fill-column.el b/visual-fill-column.el
index 0c26a1e527..b4d3a62b4e 100644
--- a/visual-fill-column.el
+++ b/visual-fill-column.el
@@ -131,26 +131,8 @@ that actually visit a file."
   "Disable `visual-fill-column-mode' for the current buffer."
   (remove-hook 'window-configuration-change-hook 
#'visual-fill-column--adjust-window 'local)
   (set-window-fringes (get-buffer-window (current-buffer)) nil)
-  (set-window-margins (get-buffer-window (current-buffer)) nil))
-
-(defun visual-fill-column-split-window (&optional window size side pixelwise)
-  "Split WINDOW, unsetting its margins first.
-SIZE, SIDE, and PIXELWISE are passed on to `split-window'.  This
-function is for use in the window parameter `split-window'."
-  (let ((horizontal (memq side '(t left right)))
-       margins new)
-    (when horizontal
-      ;; Reset margins.
-      (setq margins (window-margins window))
-      (set-window-margins window nil))
-    ;; Now try to split the window.
-    (set-window-parameter window 'split-window nil)
-    (unwind-protect
-       (setq new (split-window window size side pixelwise))
-      (set-window-parameter window 'split-window 
#'visual-fill-column-split-window)
-      ;; Restore old margins if we failed.
-      (when (and horizontal (not new))
-       (set-window-margins window (car margins) (cdr margins))))))
+  (set-window-margins (get-buffer-window (current-buffer)) nil)
+  (set-window-parameter (get-buffer-window (current-buffer)) 'min-margins nil))
 
 ;;;###autoload
 (defun visual-fill-column-split-window-sensibly (&optional window)
@@ -178,8 +160,7 @@ windows with wide margins."
   ;; Only run when we're really looking at a buffer that has v-f-c-mode 
enabled. See #22.
   (when (buffer-local-value 'visual-fill-column-mode (window-buffer 
(selected-window)))
     (set-window-fringes (get-buffer-window (current-buffer)) nil nil 
visual-fill-column-fringes-outside-margins)
-    (if (>= emacs-major-version 25)
-        (set-window-parameter (get-buffer-window (current-buffer)) 
'split-window #'visual-fill-column-split-window))
+    (set-window-parameter (get-buffer-window (current-buffer)) 'min-margins 
'(0 . 0))
     (visual-fill-column--set-margins)))
 
 (defun visual-fill-column--adjust-frame (frame)
@@ -243,6 +224,7 @@ and `text-scale-mode-step'."
       (setq left right)
       (setq right 0))
 
+    (set-window-parameter window 'min-margins '(0 . 0))
     (set-window-margins window left right)))
 
 (provide 'visual-fill-column)