[Emacs-diffs] emacs-26 b970a4a: Fix handling of `border-width' in `frameset--restore-frame' (Bug#28873)

[Martin Rudalics]

branch: emacs-26
commit b970a4a52a1c04afce4916ca2bf337e2b36d26c4
Author: Martin Rudalics <address@hidden>
Commit: Martin Rudalics <address@hidden>

    Fix handling of `border-width' in `frameset--restore-frame' (Bug#28873)
    
    * lisp/frameset.el (frameset--restore-frame): Don't process
    `border-width' parameter via ‘modify-frame-parameters’
    (Bug#28873).
---
 lisp/frameset.el | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lisp/frameset.el b/lisp/frameset.el
index bda21a8..d826f7f 100644
--- a/lisp/frameset.el
+++ b/lisp/frameset.el
@@ -1035,6 +1035,12 @@ Internal use only."
                                               (frameset--initial-params 
filtered-cfg))))
       (puthash frame :created frameset--action-map))
 
+    ;; Remove `border-width' from the list of parameters.  If it has not
+    ;; been assigned via `make-frame-on-display', any attempt to assign
+    ;; it now via `modify-frame-parameters' may result in an error on X
+    ;; (Bug#28873).
+    (setq filtered-cfg (assq-delete-all 'border-width filtered-cfg))
+
     ;; Try to assign parent-frame right here - it will improve things
     ;; for minibuffer-less child frames.
     (let* ((frame-id (frame-parameter frame 'frameset--parent-frame))