aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1994-05-06 00:32:58 +0000
committerRichard M. Stallman1994-05-06 00:32:58 +0000
commitc1e6740184ef8e07a50ee54788871d57bf4c142d (patch)
tree7352f9ce2bc979ad8cf74060182d60a0475e0e38
parent791e09d82bf5026f1dcd7ef22e70b1be31bca2a4 (diff)
downloademacs-c1e6740184ef8e07a50ee54788871d57bf4c142d.tar.gz
emacs-c1e6740184ef8e07a50ee54788871d57bf4c142d.zip
(frame-notice-user-settings): Use geometry parms from frame
when the initial specifications did not have them.
-rw-r--r--lisp/frame.el28
1 files changed, 17 insertions, 11 deletions
diff --git a/lisp/frame.el b/lisp/frame.el
index 915c96c43dc..872a2f4acce 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -187,17 +187,23 @@ These supersede the values given in `default-frame-alist'.")
187 default-frame-alist 187 default-frame-alist
188 (frame-parameters frame-initial-frame) 188 (frame-parameters frame-initial-frame)
189 nil)) 189 nil))
190 ;; Get rid of `reverse', because that was handled 190 new)
191 ;; when we first made the frame. 191 ;; Get rid of `reverse', because that was handled
192 (new (make-frame 192 ;; when we first made the frame.
193 ;; Use the geometry args that created the existing 193 (setq parms (cons '(reverse) (delq (assq 'reverse parms) parms)))
194 ;; frame, rather than the parms we get for it.q 194 (if (assq 'height frame-initial-geometry-arguments)
195 (append frame-initial-geometry-arguments 195 (setq parms (delq (assq 'height parms) parms)))
196 (let (frame-initial-geometry-arguments) 196 (if (assq 'width frame-initial-geometry-arguments)
197 (frame-remove-geometry-params 197 (setq parms (delq (assq 'width parms) parms)))
198 (cons '(reverse . nil) 198 (if (assq 'left frame-initial-geometry-arguments)
199 (delq (assq 'reverse parms) 199 (setq parms (delq (assq 'left parms) parms)))
200 parms)))))))) 200 (if (assq 'top frame-initial-geometry-arguments)
201 (setq parms (delq (assq 'top parms) parms)))
202 (setq new
203 (make-frame
204 ;; Use the geometry args that created the existing
205 ;; frame, rather than the parms we get for it.
206 (append frame-initial-geometry-arguments parms)))
201 ;; The initial frame, which we are about to delete, may be 207 ;; The initial frame, which we are about to delete, may be
202 ;; the only frame with a minibuffer. If it is, create a 208 ;; the only frame with a minibuffer. If it is, create a
203 ;; new one. 209 ;; new one.