mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-29 11:02:01 +00:00
(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.
This commit is contained in:
parent
b1fd1e8d65
commit
6eb018badd
@ -58,7 +58,7 @@ These supersede the values given in `default-frame-alist'.")
|
|||||||
|
|
||||||
(setq pop-up-frame-function
|
(setq pop-up-frame-function
|
||||||
(function (lambda ()
|
(function (lambda ()
|
||||||
(new-frame pop-up-frame-alist))))
|
(make-frame pop-up-frame-alist))))
|
||||||
|
|
||||||
(defvar special-display-frame-alist
|
(defvar special-display-frame-alist
|
||||||
'((height . 14) (width . 80) (unsplittable . t))
|
'((height . 14) (width . 80) (unsplittable . t))
|
||||||
@ -82,7 +82,7 @@ These supersede the values given in `default-frame-alist'.")
|
|||||||
(raise-frame frame)
|
(raise-frame frame)
|
||||||
window)
|
window)
|
||||||
;; If no window yet, make one in a new frame.
|
;; If no window yet, make one in a new frame.
|
||||||
(let ((frame (new-frame special-display-frame-alist)))
|
(let ((frame (make-frame special-display-frame-alist)))
|
||||||
(set-window-buffer (frame-selected-window frame) buffer)
|
(set-window-buffer (frame-selected-window frame) buffer)
|
||||||
(set-window-dedicated-p (frame-selected-window frame) t)
|
(set-window-dedicated-p (frame-selected-window frame) t)
|
||||||
(frame-selected-window frame)))))
|
(frame-selected-window frame)))))
|
||||||
@ -130,7 +130,7 @@ These supersede the values given in `default-frame-alist'.")
|
|||||||
(append initial-frame-alist default-frame-alist))
|
(append initial-frame-alist default-frame-alist))
|
||||||
(setq default-minibuffer-frame
|
(setq default-minibuffer-frame
|
||||||
(setq frame-initial-frame
|
(setq frame-initial-frame
|
||||||
(new-frame initial-frame-alist)))
|
(make-frame initial-frame-alist)))
|
||||||
;; Delete any specifications for window geometry parameters
|
;; Delete any specifications for window geometry parameters
|
||||||
;; so that we won't reapply them in frame-notice-user-settings.
|
;; so that we won't reapply them in frame-notice-user-settings.
|
||||||
;; It would be wrong to reapply them then,
|
;; It would be wrong to reapply them then,
|
||||||
@ -181,17 +181,19 @@ These supersede the values given in `default-frame-alist'.")
|
|||||||
'(minibuffer . t)))
|
'(minibuffer . t)))
|
||||||
t))
|
t))
|
||||||
;; Create the new frame.
|
;; Create the new frame.
|
||||||
(let ((new
|
(let* ((parms (append initial-frame-alist
|
||||||
(new-frame
|
default-frame-alist
|
||||||
(append initial-frame-alist
|
(frame-parameters frame-initial-frame)
|
||||||
default-frame-alist
|
nil))
|
||||||
(frame-parameters frame-initial-frame)))))
|
;; Get rid of `reverse', because that was handled
|
||||||
|
;; when we first made the frame.
|
||||||
|
(new (make-frame (cons '(reverse . nil)
|
||||||
|
(delq (assq 'reverse parms) parms)))))
|
||||||
;; The initial frame, which we are about to delete, may be
|
;; The initial frame, which we are about to delete, may be
|
||||||
;; the only frame with a minibuffer. If it is, create a
|
;; the only frame with a minibuffer. If it is, create a
|
||||||
;; new one.
|
;; new one.
|
||||||
(or (delq frame-initial-frame (minibuffer-frame-list))
|
(or (delq frame-initial-frame (minibuffer-frame-list))
|
||||||
(new-frame (append minibuffer-frame-alist
|
(make-frame (append minibuffer-frame-alist
|
||||||
'((minibuffer . only)))))
|
'((minibuffer . only)))))
|
||||||
|
|
||||||
;; If the initial frame is serving as a surrogate
|
;; If the initial frame is serving as a surrogate
|
||||||
@ -280,7 +282,7 @@ These supersede the values given in `default-frame-alist'.")
|
|||||||
;;; considered (see next-frame).
|
;;; considered (see next-frame).
|
||||||
(defun get-other-frame ()
|
(defun get-other-frame ()
|
||||||
(let ((s (if (equal (next-frame (selected-frame)) (selected-frame))
|
(let ((s (if (equal (next-frame (selected-frame)) (selected-frame))
|
||||||
(new-frame)
|
(make-frame)
|
||||||
(next-frame (selected-frame)))))
|
(next-frame (selected-frame)))))
|
||||||
s))
|
s))
|
||||||
|
|
||||||
@ -578,7 +580,7 @@ should use `set-frame-width' instead."
|
|||||||
(defalias 'ctl-x-5-prefix ctl-x-5-map)
|
(defalias 'ctl-x-5-prefix ctl-x-5-map)
|
||||||
(define-key ctl-x-map "5" 'ctl-x-5-prefix)
|
(define-key ctl-x-map "5" 'ctl-x-5-prefix)
|
||||||
|
|
||||||
(define-key ctl-x-5-map "2" 'new-frame)
|
(define-key ctl-x-5-map "2" 'make-frame)
|
||||||
(define-key ctl-x-5-map "0" 'delete-frame)
|
(define-key ctl-x-5-map "0" 'delete-frame)
|
||||||
(define-key ctl-x-5-map "o" 'other-frame)
|
(define-key ctl-x-5-map "o" 'other-frame)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user