summaryrefslogtreecommitdiff
path: root/lisp/frame.el
diff options
context:
space:
mode:
authorJim Blandy <jimb@redhat.com>1993-06-10 13:10:00 +0000
committerJim Blandy <jimb@redhat.com>1993-06-10 13:10:00 +0000
commit5e90137963135d62cc3c1fe768ccd056abd71f4f (patch)
tree9836a784040bec18bde5ff5a6f0dda27caecc55a /lisp/frame.el
parent2d52e48f106dd5d6b935b4eedc79664004b26032 (diff)
downloademacs-5e90137963135d62cc3c1fe768ccd056abd71f4f.tar.gz
* frame.el (frame-initialize): When deleting geometry
specifications from initial-frame-alist, remember that they may occur more than once, and do, if the -geometry option was specified as well as a .geometry resource.
Diffstat (limited to 'lisp/frame.el')
-rw-r--r--lisp/frame.el13
1 files changed, 7 insertions, 6 deletions
diff --git a/lisp/frame.el b/lisp/frame.el
index f18dbb29606..87cdd366699 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -102,12 +102,13 @@ These supersede the values given in `default-frame-alist'.")
;; so that we won't reapply them in frame-notice-user-settings.
;; It would be wrong to reapply them then,
;; because that would override explicit user resizing.
- (setq initial-frame-alist
- (delq (assq 'height initial-frame-alist)
- (delq (assq 'width initial-frame-alist)
- (delq (assq 'left initial-frame-alist)
- (delq (assq 'top initial-frame-alist)
- initial-frame-alist)))))
+ ;; Remember that they may occur more than once.
+ (let ((tail initial-frame-alist))
+ (while (consp tail)
+ (if (and (consp (car tail))
+ (memq (car (car tail)) '(height width top left)))
+ (setq initial-frame-alist
+ (delq tail initial-frame-alist)))))
;; Handle `reverse' as a parameter.
(if (cdr (or (assq 'reverse initial-frame-alist)
(assq 'reverse default-frame-alist)