summaryrefslogtreecommitdiff
path: root/lisp/window.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2020-11-07 09:57:56 -0800
committerGlenn Morris <rgm@gnu.org>2020-11-07 09:57:56 -0800
commit33e8116fc2c24b14d30c08a09cc034bea6f9d584 (patch)
tree1be8512dcde3fbf6679f931295eabbe4bb6e1b0d /lisp/window.el
parent1de00441a5cd983ae4d76eecd80286928e791e96 (diff)
parentf5d7fb3a2dee3f9ae49151e3d01483aad7fb734b (diff)
downloademacs-33e8116fc2c24b14d30c08a09cc034bea6f9d584.tar.gz
Merge from origin/emacs-27
f5d7fb3a2d (origin/emacs-27) Fix 'uudecode-decode-region-internal' in... d4242177da Fix 'send-string-to-terminal' writing very long strings 9da0f4026c * lisp/subr.el (read-char-from-minibuffer): Doc fix. (Bug... 9899f74e4e Merge branch 'emacs-27' of git.savannah.gnu.org:/srv/git/e... a6fcba783e Fix documentation of 'windmove-swap-states-default-keybind... f4acd7a924 Split windows evenly when 'min-margins' parameter was set ...
Diffstat (limited to 'lisp/window.el')
-rw-r--r--lisp/window.el8
1 files changed, 7 insertions, 1 deletions
diff --git a/lisp/window.el b/lisp/window.el
index 865f6fdd5cc..d564ec55468 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -5488,7 +5488,13 @@ frame. The selected window is not changed by this function."
(set-window-parameter (window-parent new) 'window-atom t))
(set-window-parameter new 'window-atom t)))
- ;; Sanitize sizes unless SIZE was specified.
+ ;; Make the new window inherit the `min-margins' parameter of
+ ;; WINDOW (Bug#44483).
+ (let ((min-margins (window-parameter window 'min-margins)))
+ (when min-margins
+ (set-window-parameter new 'min-margins min-margins)))
+
+ ;; Sanitize sizes unless SIZE was specified.
(unless size
(window--sanitize-window-sizes horizontal))