diff options
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. | |||
| 950 | For the meaning of FILTERS and FORCE-ONSCREEN, see `frameset-restore'. | 950 | For the meaning of FILTERS and FORCE-ONSCREEN, see `frameset-restore'. |
| 951 | Internal use only." | 951 | Internal use only." |
| 952 | (let* ((fullscreen (cdr (assq 'fullscreen parameters))) | 952 | (let* ((fullscreen (cdr (assq 'fullscreen parameters))) |
| 953 | (lines (assq 'tool-bar-lines parameters)) | ||
| 954 | (filtered-cfg (frameset-filter-params parameters filters nil)) | 953 | (filtered-cfg (frameset-filter-params parameters filters nil)) |
| 955 | (display (cdr (assq 'display filtered-cfg))) ;; post-filtering | 954 | (display (cdr (assq 'display filtered-cfg))) ;; post-filtering |
| 956 | alt-cfg frame) | 955 | alt-cfg frame) |
| 957 | 956 | ||
| 958 | ;; This works around bug#14795 (or feature#14795, if not a bug :-) | ||
| 959 | (setq filtered-cfg (assq-delete-all 'tool-bar-lines filtered-cfg)) | ||
| 960 | (push '(tool-bar-lines . 0) filtered-cfg) | ||
| 961 | |||
| 962 | (when fullscreen | 957 | (when fullscreen |
| 963 | ;; Currently Emacs has the limitation that it does not record the size | 958 | ;; Currently Emacs has the limitation that it does not record the size |
| 964 | ;; and position of a frame before maximizing it, so we cannot save & | 959 | ;; and position of a frame before maximizing it, so we cannot save & |
| @@ -1009,8 +1004,7 @@ Internal use only." | |||
| 1009 | (not (eq (frame-parameter frame 'visibility) 'icon))) | 1004 | (not (eq (frame-parameter frame 'visibility) 'icon))) |
| 1010 | (frameset-move-onscreen frame force-onscreen)) | 1005 | (frameset-move-onscreen frame force-onscreen)) |
| 1011 | 1006 | ||
| 1012 | ;; Let's give the finishing touches (visibility, tool-bar, maximization). | 1007 | ;; Let's give the finishing touches (visibility, maximization). |
| 1013 | (when lines (push lines alt-cfg)) | ||
| 1014 | (when alt-cfg (modify-frame-parameters frame alt-cfg)) | 1008 | (when alt-cfg (modify-frame-parameters frame alt-cfg)) |
| 1015 | ;; Now restore window state. | 1009 | ;; Now restore window state. |
| 1016 | (window-state-put window-state (frame-root-window frame) 'safe) | 1010 | (window-state-put window-state (frame-root-window frame) 'safe) |