# HG changeset patch
# User Karoly Lorentey <lorentey@elte.hu>
# Date 1126134681 0
# Node ID 0036e612aaefc3a321708effb4f91e2500c1e6fb
# Parent  8f0c7632f259e491a9fdbcd738654e198e3f545e
Apply settings in `window-system-default-frame-alist' to the initial frame as well.

* lisp/frame.el (frame-notice-user-settings): Extend to apply
  settings in `window-system-default-frame-alist' as well.



git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-400

diff -r 8f0c7632f259 -r 0036e612aaef lisp/frame.el
--- a/lisp/frame.el	Wed Sep 07 02:29:18 2005 +0000
+++ b/lisp/frame.el	Wed Sep 07 23:11:21 2005 +0000
@@ -251,7 +251,9 @@
 ;; information to which we must react; do what needs to be done.
 (defun frame-notice-user-settings ()
   "Act on user's init file settings of frame parameters.
-React to settings of `default-frame-alist', `initial-frame-alist' there."
+React to settings of `initial-frame-alist',
+`window-system-default-frame-alist' and `default-frame-alist'
+there (in decreasing order of priority)."
   ;; Make menu-bar-mode and default-frame-alist consistent.
   (when (boundp 'menu-bar-mode)
     (let ((default (assq 'menu-bar-lines default-frame-alist)))
@@ -279,7 +281,9 @@
   ;; want to use save-excursion here, because that may also try to set
   ;; the buffer of the selected window, which fails when the selected
   ;; window is the minibuffer.
-  (let ((old-buffer (current-buffer)))
+  (let ((old-buffer (current-buffer))
+	(window-system-frame-alist (cdr (assq initial-window-system
+					      window-system-default-frame-alist))))
 
     (when (and frame-notice-user-settings
 	       (null frame-initial-frame))
@@ -293,6 +297,7 @@
 	(modify-frame-parameters nil
 				 (if (null initial-window-system)
 				     (append initial-frame-alist
+					     window-system-frame-alist
 					     default-frame-alist
 					     parms
 					     nil)
@@ -322,6 +327,7 @@
       ;; switch `tool-bar-mode' off.
       (when (display-graphic-p)
 	(let ((tool-bar-lines (or (assq 'tool-bar-lines initial-frame-alist)
+				  (assq 'tool-bar-lines window-system-frame-alist)
 				  (assq 'tool-bar-lines default-frame-alist))))
 	  (when (and tool-bar-originally-present
                      (or (null tool-bar-lines)
@@ -382,6 +388,7 @@
       ;; create here, so that its new value, gleaned from the user's
       ;; .emacs file, will be applied to the existing screen.
       (if (not (eq (cdr (or (assq 'minibuffer initial-frame-alist)
+			    (assq 'minibuffer window-system-frame-alist)
 			    (assq 'minibuffer default-frame-alist)
 			    '(minibuffer . t)))
 		   t))
@@ -401,6 +408,7 @@
 		(setq parms (delq (assq 'name parms) parms)))
 
 	    (setq parms (append initial-frame-alist
+				window-system-frame-alist
 				default-frame-alist
 				parms
 				nil))
@@ -480,6 +488,7 @@
 	;; the new parameters.
 	(let (newparms allparms tail)
 	  (setq allparms (append initial-frame-alist
+				 window-system-frame-alist
 				 default-frame-alist nil))
 	  (if (assq 'height frame-initial-geometry-arguments)
 	      (setq allparms (assq-delete-all 'height allparms)))