From 857ba6ec4622ba658788b8cd5805e8e9e8a5db16 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Thu, 27 Mar 2014 02:01:36 +0100 Subject: [PATCH] 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. --- lisp/ChangeLog | 3 +++ lisp/frameset.el | 8 +------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b0e3f041ec..cb256740a0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2014-03-27 Juanma Barranquero + * frameset.el (frameset--restore-frame): Remove workaround for bug#14795 + which is no longer needed and causes trouble in GTK builds (bug#17046). + * emacs-lisp/package-x.el (package--archive-contents-from-url): Use url-insert-file-contents; package-handle-response no longer exists. diff --git a/lisp/frameset.el b/lisp/frameset.el index c1a7ecc16b..9a47451981 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) -- 2.20.1