diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2013-07-25 02:37:56 +0200 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2013-07-25 02:37:56 +0200 |
| commit | cb3a56d2389eb6fe0635bd28b863c3a0734279c6 (patch) | |
| tree | 2082d17f52abc0ca9f2fa8f939d0b015313c9144 /lisp/desktop.el | |
| parent | 8121f08950ca36647a6dfa32d02be574b253d9df (diff) | |
| download | emacs-cb3a56d2389eb6fe0635bd28b863c3a0734279c6.tar.gz | |
lisp/desktop.el: Add workaround for bug#14949.
(desktop--make-frame): Do not pass the `fullscreen' parameter to
modify-frame-parameters if the value has not changed.
(desktop--make-frame): On cl-delete-if call, check parameter name,
not full parameter.
Diffstat (limited to 'lisp/desktop.el')
| -rw-r--r-- | lisp/desktop.el | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lisp/desktop.el b/lisp/desktop.el index f4622ae4961..291f28a79db 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -1289,7 +1289,7 @@ its window state. Internal use only." (visible (assq 'visibility filtered-cfg))) (setq filtered-cfg (cl-delete-if (lambda (p) (memq p '(visibility fullscreen width height))) - filtered-cfg)) + filtered-cfg :key #'car)) (when width (setq filtered-cfg (append `((user-size . t) (width . ,width)) filtered-cfg))) @@ -1302,7 +1302,11 @@ its window state. Internal use only." ;; Time to select or create a frame an apply the big bunch of parameters (if (setq frame (desktop--select-frame display filtered-cfg)) - (modify-frame-parameters frame filtered-cfg) + (modify-frame-parameters frame + (if (eq (frame-parameter frame 'fullscreen) fullscreen) + ;; Workaround for bug#14949 + (assq-delete-all 'fullscreen filtered-cfg) + filtered-cfg)) (setq frame (make-frame-on-display display filtered-cfg))) ;; Let's give the finishing touches (visibility, tool-bar, maximization). |