aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaroly Lorentey2005-07-22 03:24:10 +0000
committerKaroly Lorentey2005-07-22 03:24:10 +0000
commite682e37ece43c06248fd4b9a46907cb1ec272e7d (patch)
treee74d4b47408cd61a87d90bac85f4c3bfae117128
parentc6c53c3e656510ac37ac58c426079d799dbae945 (diff)
downloademacs-e682e37ece43c06248fd4b9a46907cb1ec272e7d.tar.gz
emacs-e682e37ece43c06248fd4b9a46907cb1ec272e7d.zip
Don't let window-system-default-frame-alist override parameters specified manually.
* lisp/frame.el (make-frame): Append window-system-default-frame-alist to parameters before calling frame-creation-function. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-389
-rw-r--r--lisp/frame.el4
1 files changed, 1 insertions, 3 deletions
diff --git a/lisp/frame.el b/lisp/frame.el
index 355486daa0a..0f64a361a97 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -667,9 +667,7 @@ setup is for focus to follow the pointer."
667 (unless frame-creation-function 667 (unless frame-creation-function
668 (error "Don't know how to create a frame on window system %s" w)) 668 (error "Don't know how to create a frame on window system %s" w))
669 (run-hooks 'before-make-frame-hook) 669 (run-hooks 'before-make-frame-hook)
670 (setq frame (funcall frame-creation-function parameters)) 670 (setq frame (funcall frame-creation-function (append parameters (cdr (assq w window-system-default-frame-alist)))))
671 (modify-frame-parameters frame
672 (cdr (assq w window-system-default-frame-alist)))
673 (run-hook-with-args 'after-make-frame-functions frame) 671 (run-hook-with-args 'after-make-frame-functions frame)
674 frame)) 672 frame))
675 673