[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r104658: Don't make popup frames unsp
From: |
martin rudalics |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r104658: Don't make popup frames unsplittable by default. |
Date: |
Tue, 21 Jun 2011 17:16:32 +0200 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 104658
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Tue 2011-06-21 17:16:32 +0200
message:
Don't make popup frames unsplittable by default.
(display-buffer-alist, display-buffer-default-specifiers): Don't
make new frame unsplittable by default.
(display-buffer-normalize-argument): Fix doc-string typo and use
'same-frame-other-window instead of 'other-window when associating
with display-buffer-macro-specifiers.
modified:
lisp/ChangeLog
lisp/window.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-06-21 10:04:28 +0000
+++ b/lisp/ChangeLog 2011-06-21 15:16:32 +0000
@@ -20,6 +20,11 @@
options more faithfully.
(pop-to-buffer): Don't rely on `display-buffer' selecting the
window if it is on another frame.
+ (display-buffer-alist, display-buffer-default-specifiers): Don't
+ make new frame unsplittable by default.
+ (display-buffer-normalize-argument): Fix doc-string typo and use
+ 'same-frame-other-window instead of 'other-window when associating
+ with display-buffer-macro-specifiers.
2011-06-21 Vincent Belaïche <address@hidden>
=== modified file 'lisp/window.el'
--- a/lisp/window.el 2011-06-21 08:51:30 +0000
+++ b/lisp/window.el 2011-06-21 15:16:32 +0000
@@ -3821,7 +3821,7 @@
(pop-up-window-min-width . 80)
(reuse-window other nil nil)
(pop-up-frame-alist
- (height . 24) (width . 80) (unsplittable . t))
+ (height . 24) (width . 80))
(reuse-window nil other visible)
(reuse-window nil nil t)
(reuse-window-even-sizes . t))
@@ -4372,8 +4372,7 @@
:tag "Pop-up frame"
:value (pop-up-frame
(pop-up-frame)
- (pop-up-frame-alist
- (height . 24) (width . 80) (unsplittable . t)))
+ (pop-up-frame-alist (height . 24) (width . 80)))
:format "%t\n%v"
:inline t
(const :format "" pop-up-frame)
@@ -5306,7 +5305,7 @@
BUFFER-NAME is the name of the buffer that shall be displayed,
SPECIFIERS is the second argument of `display-buffer'. LABEL the
same argument of `display-buffer'. OTHER-FRAME non-nil means use
-other-frame for other-windo."
+other-frame for other-window."
(let (normalized entry)
(cond
((not specifiers)
@@ -5321,7 +5320,7 @@
;; `other-window' must be treated separately.
(let ((entry (assq (if other-frame
'other-frame
- 'other-window)
+ 'same-frame-other-window)
display-buffer-macro-specifiers)))
(dolist (item (cdr entry))
(setq normalized (cons item normalized)))))
@@ -5434,14 +5433,16 @@
(when (listp pars) pars))
specifiers)))))
- ;; `pop-up-frames', `display-buffer-reuse-frames', and
- ;; `last-nonminibuffer-frame' set means search for a window shoing
- ;; the same buffer of another frame.
+ ;; `pop-up-frames', `display-buffer-reuse-frames' means search for
+ ;; a window showing the buffer on some visible or iconfied frame.
+ ;; `last-nonminibuffer-frame' set and not the same frame means
+ ;; search that frame.
(let ((frames (or (and (or use-pop-up-frames
display-buffer-reuse-frames
(not (last-nonminibuffer-frame)))
;; All visible or iconfied frames.
0)
+ ;; Same frame.
(last-nonminibuffer-frame))))
(when frames
(setq specifiers
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r104658: Don't make popup frames unsplittable by default.,
martin rudalics <=