master b13e311f0b: Improve handling of frame-inherited-parameters

[Lars Ingebrigtsen]

branch: master
commit b13e311f0babd7ab30d555ad542249b1a2ad9e2e
Author: martin rudalics <rudalics@gmx.at>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Improve handling of frame-inherited-parameters
    
    * lisp/frame.el (make-frame): Improve handling of
    frame-inherited-parameters (bug#24651).
---
 lisp/frame.el | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/lisp/frame.el b/lisp/frame.el
index 6bf4c6178b..e9c88adc7c 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -883,7 +883,6 @@ the new frame according to its own rules."
                   (error "Don't know how to interpret display %S"
                          display)))
              (t window-system)))
-        (oldframe (selected-frame))
         (params parameters)
         frame child-frame)
 
@@ -901,8 +900,12 @@ the new frame according to its own rules."
     (dolist (p default-frame-alist)
       (unless (assq (car p) params)
        (push p params)))
-
-;;     (setq frame-size-history '(1000))
+    ;; Add parameters from `frame-inherited-parameters' unless they are
+    ;; overridden by explicit parameters.
+    (dolist (param frame-inherited-parameters)
+      (unless (assq param parameters)
+        (let ((val (frame-parameter nil param)))
+          (when val (push (cons param val) params)))))
 
     (when (eq (cdr (or (assq 'minibuffer params) '(minibuffer . t)))
               'child-frame)
@@ -935,12 +938,6 @@ the new frame according to its own rules."
          frame 'minibuffer (frame-root-window child-frame))))
 
     (normal-erase-is-backspace-setup-frame frame)
-    ;; Inherit original frame's parameters unless they are overridden
-    ;; by explicit parameters.
-    (dolist (param frame-inherited-parameters)
-      (unless (assq param parameters)
-        (let ((val (frame-parameter oldframe param)))
-          (when val (set-frame-parameter frame param val)))))
 
     ;; We can run `window-configuration-change-hook' for this frame now.
     (frame-after-make-frame frame t)