[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r116868: lisp/frameset.el: Fix bug#17046.
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] emacs-24 r116868: lisp/frameset.el: Fix bug#17046. |
Date: |
Thu, 27 Mar 2014 01:01:43 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 116868
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17046
committer: Juanma Barranquero <address@hidden>
branch nick: emacs-24
timestamp: Thu 2014-03-27 02:01:36 +0100
message:
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.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/frameset.el frameset.el-20130802043218-tfwraxv1c2zlibpw-1
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-03-27 00:20:50 +0000
+++ b/lisp/ChangeLog 2014-03-27 01:01:36 +0000
@@ -1,5 +1,8 @@
2014-03-27 Juanma Barranquero <address@hidden>
+ * 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.
=== modified file 'lisp/frameset.el'
--- a/lisp/frameset.el 2014-03-24 20:01:21 +0000
+++ b/lisp/frameset.el 2014-03-27 01:01:36 +0000
@@ -950,15 +950,10 @@
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 @@
(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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r116868: lisp/frameset.el: Fix bug#17046.,
Juanma Barranquero <=