# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 789799450 0
# Node ID 2743977604b1dd7a86d78e9678da246499af78d9
# Parent  f70663b671542943a01ef2d62b9586857bf29975
Put height and width from geometry parm into default-frame-alist.

diff -r f70663b67154 -r 2743977604b1 lisp/term/x-win.el
--- a/lisp/term/x-win.el	Wed Jan 11 03:36:30 1995 +0000
+++ b/lisp/term/x-win.el	Wed Jan 11 04:44:10 1995 +0000
@@ -693,10 +693,22 @@
 ;; Apply a geometry resource to the initial frame.  Put it at the end
 ;; of the alist, so that anything specified on the command line takes
 ;; precedence.
-(let ((res-geometry (x-get-resource "geometry" "Geometry")))
+(let* ((res-geometry (x-get-resource "geometry" "Geometry"))
+       parsed)
   (if res-geometry
-      (setq initial-frame-alist (append initial-frame-alist
-					(x-parse-geometry res-geometry)))))
+      (progn
+	(setq parsed (x-parse-geometry res-geometry))
+	;; 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)
+	    (setq default-frame-alist
+		  (cons (cons 'height (cdr (assq 'height parsed)))
+			default-frame-alist)))
+	(if (assq 'width parsed)
+	    (setq default-frame-alist
+		  (cons (cons 'width (cdr (assq 'width parsed)))
+			default-frame-alist))))))
 
 ;; Check the reverseVideo resource.
 (let ((case-fold-search t))