From: Martin Rudalics <rudalics@gmx.at>
Date: Wed, 18 Oct 2017 08:04:40 +0000 (+0200)
Subject: Fix handling of `border-width' in `frameset--restore-frame' (Bug#28873)
X-Git-Tag: emacs-26.0.91~527
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b970a4a52a;p=emacs.git

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).
---

diff --git a/lisp/frameset.el b/lisp/frameset.el
index bda21a8b8d7..d826f7fcdce 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))