diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2014-03-27 18:34:22 +0100 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2014-03-27 18:34:22 +0100 |
| commit | 1e757eb0a5bab2bdd26de8a6553ee5c2b2e2a381 (patch) | |
| tree | 01db12aa0584e566f44f32c062a67f98ea836837 /lisp/frameset.el | |
| parent | b9b37dd04e6f60ef16738efe1b396a9e0a461d86 (diff) | |
| parent | 0c4e715c98919593413a76a0ab1458b0d10ea287 (diff) | |
| download | emacs-1e757eb0a5bab2bdd26de8a6553ee5c2b2e2a381.tar.gz | |
Merge from emacs-24; up to 2014-03-24T03:06:35Z!dancol@dancol.org
Diffstat (limited to 'lisp/frameset.el')
| -rw-r--r-- | lisp/frameset.el | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lisp/frameset.el b/lisp/frameset.el index 2f1453f2a19..b943d47e7bf 100644 --- a/lisp/frameset.el +++ b/lisp/frameset.el @@ -950,15 +950,10 @@ PARAMETERS is the frame's parameter alist; WINDOW-STATE is its window state. For the meaning of FILTERS and FORCE-ONSCREEN, see `frameset-restore'. Internal use only." (let* ((fullscreen (cdr (assq 'fullscreen parameters))) - (lines (assq 'tool-bar-lines parameters)) (filtered-cfg (frameset-filter-params parameters filters nil)) (display (cdr (assq 'display filtered-cfg))) ;; post-filtering alt-cfg frame) - ;; This works around bug#14795 (or feature#14795, if not a bug :-) - (setq filtered-cfg (assq-delete-all 'tool-bar-lines filtered-cfg)) - (push '(tool-bar-lines . 0) filtered-cfg) - (when fullscreen ;; Currently Emacs has the limitation that it does not record the size ;; and position of a frame before maximizing it, so we cannot save & @@ -1009,8 +1004,7 @@ Internal use only." (not (eq (frame-parameter frame 'visibility) 'icon))) (frameset-move-onscreen frame force-onscreen)) - ;; Let's give the finishing touches (visibility, tool-bar, maximization). - (when lines (push lines alt-cfg)) + ;; Let's give the finishing touches (visibility, maximization). (when alt-cfg (modify-frame-parameters frame alt-cfg)) ;; Now restore window state. (window-state-put window-state (frame-root-window frame) 'safe) |