diff options
| author | Martin Rudalics <rudalics@gmx.at> | 2017-10-18 10:04:40 +0200 |
|---|---|---|
| committer | Martin Rudalics <rudalics@gmx.at> | 2017-10-18 10:04:40 +0200 |
| commit | b970a4a52a1c04afce4916ca2bf337e2b36d26c4 (patch) | |
| tree | afc7c390d266ac9d7b2f4383eb5884588c778ed3 /lisp/frameset.el | |
| parent | 445e92658f16255b30b359e296d301fa6b929872 (diff) | |
| download | emacs-b970a4a52a1c04afce4916ca2bf337e2b36d26c4.tar.gz | |
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).
Diffstat (limited to 'lisp/frameset.el')
| -rw-r--r-- | lisp/frameset.el | 6 |
1 files changed, 6 insertions, 0 deletions
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)) |