Mercurial > emacs

diff lisp/term/mac-win.el @ 90645:7eeafaaa9eab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 476-489) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 153-160) - Merge from emacs--devo--0 - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-127
author Miles Bader <miles@gnu.org>
date Mon, 30 Oct 2006 08:54:41 +0000
parents a1a25ac6c88a 246a1d48fea4
children 6588c6259dfb
line wrap: on
line diff
--- a/lisp/term/mac-win.el	Mon Oct 30 06:52:47 2006 +0000
+++ b/lisp/term/mac-win.el	Mon Oct 30 08:54:41 2006 +0000
@@ -2398,12 +2398,15 @@
 			       (cons '(user-size . t) parsed))))
 	;; All geometry parms apply to the initial frame.
 	(setq initial-frame-alist (append initial-frame-alist parsed))
-	;; The size parms apply to all frames.
-	(if (assq 'height parsed)
+	;; The size parms apply to all frames.  Don't set it if there are
+	;; sizes there already (from command line).
+	(if (and (assq 'height parsed)
+		 (not (assq 'height default-frame-alist)))
 	    (setq default-frame-alist
 		  (cons (cons 'height (cdr (assq 'height parsed)))
 			default-frame-alist)))
-	(if (assq 'width parsed)
+	(if (and (assq 'width parsed)
+		 (not (assq 'width default-frame-alist)))
 	    (setq default-frame-alist
 		  (cons (cons 'width (cdr (assq 'width parsed)))
 			default-frame-alist))))))