diff options
| author | Richard M. Stallman | 1994-05-04 22:41:02 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1994-05-04 22:41:02 +0000 |
| commit | 6eb018badd4d49b4f5f70477a5dbde5824c551d8 (patch) | |
| tree | a285c5d3c2ee3b765ea089db881546df1cb731a0 | |
| parent | b1fd1e8d65a305a01db95d88afb95cf1a3501625 (diff) | |
| download | emacs-6eb018badd4d49b4f5f70477a5dbde5824c551d8.tar.gz emacs-6eb018badd4d49b4f5f70477a5dbde5824c551d8.zip | |
(frame-notice-user-settings): Discard `reverse' when
making the replacement for the initial frame. Put it on as nil.
(new-frame): Use make-frame instead.
| -rw-r--r-- | lisp/frame.el | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/lisp/frame.el b/lisp/frame.el index e32e0ea814f..1b7ef4a1ba7 100644 --- a/lisp/frame.el +++ b/lisp/frame.el | |||
| @@ -58,7 +58,7 @@ These supersede the values given in `default-frame-alist'.") | |||
| 58 | 58 | ||
| 59 | (setq pop-up-frame-function | 59 | (setq pop-up-frame-function |
| 60 | (function (lambda () | 60 | (function (lambda () |
| 61 | (new-frame pop-up-frame-alist)))) | 61 | (make-frame pop-up-frame-alist)))) |
| 62 | 62 | ||
| 63 | (defvar special-display-frame-alist | 63 | (defvar special-display-frame-alist |
| 64 | '((height . 14) (width . 80) (unsplittable . t)) | 64 | '((height . 14) (width . 80) (unsplittable . t)) |
| @@ -82,7 +82,7 @@ These supersede the values given in `default-frame-alist'.") | |||
| 82 | (raise-frame frame) | 82 | (raise-frame frame) |
| 83 | window) | 83 | window) |
| 84 | ;; If no window yet, make one in a new frame. | 84 | ;; If no window yet, make one in a new frame. |
| 85 | (let ((frame (new-frame special-display-frame-alist))) | 85 | (let ((frame (make-frame special-display-frame-alist))) |
| 86 | (set-window-buffer (frame-selected-window frame) buffer) | 86 | (set-window-buffer (frame-selected-window frame) buffer) |
| 87 | (set-window-dedicated-p (frame-selected-window frame) t) | 87 | (set-window-dedicated-p (frame-selected-window frame) t) |
| 88 | (frame-selected-window frame))))) | 88 | (frame-selected-window frame))))) |
| @@ -130,7 +130,7 @@ These supersede the values given in `default-frame-alist'.") | |||
| 130 | (append initial-frame-alist default-frame-alist)) | 130 | (append initial-frame-alist default-frame-alist)) |
| 131 | (setq default-minibuffer-frame | 131 | (setq default-minibuffer-frame |
| 132 | (setq frame-initial-frame | 132 | (setq frame-initial-frame |
| 133 | (new-frame initial-frame-alist))) | 133 | (make-frame initial-frame-alist))) |
| 134 | ;; Delete any specifications for window geometry parameters | 134 | ;; Delete any specifications for window geometry parameters |
| 135 | ;; so that we won't reapply them in frame-notice-user-settings. | 135 | ;; so that we won't reapply them in frame-notice-user-settings. |
| 136 | ;; It would be wrong to reapply them then, | 136 | ;; It would be wrong to reapply them then, |
| @@ -181,17 +181,19 @@ These supersede the values given in `default-frame-alist'.") | |||
| 181 | '(minibuffer . t))) | 181 | '(minibuffer . t))) |
| 182 | t)) | 182 | t)) |
| 183 | ;; Create the new frame. | 183 | ;; Create the new frame. |
| 184 | (let ((new | 184 | (let* ((parms (append initial-frame-alist |
| 185 | (new-frame | 185 | default-frame-alist |
| 186 | (append initial-frame-alist | 186 | (frame-parameters frame-initial-frame) |
| 187 | default-frame-alist | 187 | nil)) |
| 188 | (frame-parameters frame-initial-frame))))) | 188 | ;; Get rid of `reverse', because that was handled |
| 189 | 189 | ;; when we first made the frame. | |
| 190 | (new (make-frame (cons '(reverse . nil) | ||
| 191 | (delq (assq 'reverse parms) parms))))) | ||
| 190 | ;; The initial frame, which we are about to delete, may be | 192 | ;; The initial frame, which we are about to delete, may be |
| 191 | ;; the only frame with a minibuffer. If it is, create a | 193 | ;; the only frame with a minibuffer. If it is, create a |
| 192 | ;; new one. | 194 | ;; new one. |
| 193 | (or (delq frame-initial-frame (minibuffer-frame-list)) | 195 | (or (delq frame-initial-frame (minibuffer-frame-list)) |
| 194 | (new-frame (append minibuffer-frame-alist | 196 | (make-frame (append minibuffer-frame-alist |
| 195 | '((minibuffer . only))))) | 197 | '((minibuffer . only))))) |
| 196 | 198 | ||
| 197 | ;; If the initial frame is serving as a surrogate | 199 | ;; If the initial frame is serving as a surrogate |
| @@ -280,7 +282,7 @@ These supersede the values given in `default-frame-alist'.") | |||
| 280 | ;;; considered (see next-frame). | 282 | ;;; considered (see next-frame). |
| 281 | (defun get-other-frame () | 283 | (defun get-other-frame () |
| 282 | (let ((s (if (equal (next-frame (selected-frame)) (selected-frame)) | 284 | (let ((s (if (equal (next-frame (selected-frame)) (selected-frame)) |
| 283 | (new-frame) | 285 | (make-frame) |
| 284 | (next-frame (selected-frame))))) | 286 | (next-frame (selected-frame))))) |
| 285 | s)) | 287 | s)) |
| 286 | 288 | ||
| @@ -578,7 +580,7 @@ should use `set-frame-width' instead." | |||
| 578 | (defalias 'ctl-x-5-prefix ctl-x-5-map) | 580 | (defalias 'ctl-x-5-prefix ctl-x-5-map) |
| 579 | (define-key ctl-x-map "5" 'ctl-x-5-prefix) | 581 | (define-key ctl-x-map "5" 'ctl-x-5-prefix) |
| 580 | 582 | ||
| 581 | (define-key ctl-x-5-map "2" 'new-frame) | 583 | (define-key ctl-x-5-map "2" 'make-frame) |
| 582 | (define-key ctl-x-5-map "0" 'delete-frame) | 584 | (define-key ctl-x-5-map "0" 'delete-frame) |
| 583 | (define-key ctl-x-5-map "o" 'other-frame) | 585 | (define-key ctl-x-5-map "o" 'other-frame) |
| 584 | 586 | ||