# HG changeset patch
# User Jan Dj¸«£rv <jan.h.d@swipnet.se>
# Date 1161180316 0
# Node ID fdbf03ef04dc0d0c11e77fed9c0bcc92b09345e9
# Parent  8ae73e613065025c033db3d49ac4e2bcf9a2704c
 * term/x-win.el (res-geometry): Don't set geometry from Xresources
 to default-frame-alist if default-frame-alist already contains
 widht/height.

diff -r 8ae73e613065 -r fdbf03ef04dc lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Oct 18 11:12:59 2006 +0000
+++ b/lisp/ChangeLog	Wed Oct 18 14:05:16 2006 +0000
@@ -1,3 +1,9 @@
+2006-10-18  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* term/x-win.el (res-geometry): Don't set geometry from Xresources
+	to default-frame-alist if default-frame-alist already contains
+	widht/height.
+
 2006-10-18  Richard Stallman  <rms@gnu.org>
 
 	* emacs-lisp/pp.el (pp-eval-expression): Use `X' to read value.
diff -r 8ae73e613065 -r fdbf03ef04dc lisp/term/x-win.el
--- a/lisp/term/x-win.el	Wed Oct 18 11:12:59 2006 +0000
+++ b/lisp/term/x-win.el	Wed Oct 18 14:05:16 2006 +0000
@@ -2448,12 +2448,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))))))