From: Richard M. Stallman <rms@gnu.org>
Date: Wed, 11 Jan 1995 04:44:10 +0000 (+0000)
Subject: Put height and width from geometry parm into default-frame-alist.
X-Git-Tag: emacs-19.34~5458
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e42a4b863a18873535018118ffb886c6176ca801;p=emacs.git

Put height and width from geometry parm into default-frame-alist.
---

diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 94abf5f6b82..e09a04fc223 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -693,10 +693,22 @@ This is in addition to the primary selection.")
 ;; 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))