diff options
| author | Jim Blandy | 1993-06-10 13:10:00 +0000 |
|---|---|---|
| committer | Jim Blandy | 1993-06-10 13:10:00 +0000 |
| commit | 5e90137963135d62cc3c1fe768ccd056abd71f4f (patch) | |
| tree | 9836a784040bec18bde5ff5a6f0dda27caecc55a | |
| parent | 2d52e48f106dd5d6b935b4eedc79664004b26032 (diff) | |
| download | emacs-5e90137963135d62cc3c1fe768ccd056abd71f4f.tar.gz emacs-5e90137963135d62cc3c1fe768ccd056abd71f4f.zip | |
* 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.
| -rw-r--r-- | lisp/frame.el | 13 |
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'.") | |||
| 102 | ;; so that we won't reapply them in frame-notice-user-settings. | 102 | ;; so that we won't reapply them in frame-notice-user-settings. |
| 103 | ;; It would be wrong to reapply them then, | 103 | ;; It would be wrong to reapply them then, |
| 104 | ;; because that would override explicit user resizing. | 104 | ;; because that would override explicit user resizing. |
| 105 | (setq initial-frame-alist | 105 | ;; Remember that they may occur more than once. |
| 106 | (delq (assq 'height initial-frame-alist) | 106 | (let ((tail initial-frame-alist)) |
| 107 | (delq (assq 'width initial-frame-alist) | 107 | (while (consp tail) |
| 108 | (delq (assq 'left initial-frame-alist) | 108 | (if (and (consp (car tail)) |
| 109 | (delq (assq 'top initial-frame-alist) | 109 | (memq (car (car tail)) '(height width top left))) |
| 110 | initial-frame-alist))))) | 110 | (setq initial-frame-alist |
| 111 | (delq tail initial-frame-alist))))) | ||
| 111 | ;; Handle `reverse' as a parameter. | 112 | ;; Handle `reverse' as a parameter. |
| 112 | (if (cdr (or (assq 'reverse initial-frame-alist) | 113 | (if (cdr (or (assq 'reverse initial-frame-alist) |
| 113 | (assq 'reverse default-frame-alist) | 114 | (assq 'reverse default-frame-alist) |