diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2014-03-27 02:01:36 +0100 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2014-03-27 02:01:36 +0100 |
| commit | 857ba6ec4622ba658788b8cd5805e8e9e8a5db16 (patch) | |
| tree | e693c5e373a08597911d962d54d5a9ce45dbfaae /lisp/frameset.el | |
| parent | b1c870c9e8b8fd7001234d60fbb110c028c2f350 (diff) | |
| download | emacs-857ba6ec4622ba658788b8cd5805e8e9e8a5db16.tar.gz | |
lisp/frameset.el: Fix bug#17046.
(frameset--restore-frame): Remove workaround for bug#14795
which is no longer needed and causes trouble in GTK builds.
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 c1a7ecc16b8..9a474519813 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) |