[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r108421: Fix active minibuffer case f
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r108421: Fix active minibuffer case for window-deletable-p. |
Date: |
Tue, 29 May 2012 20:22:49 +0800 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 108421
author: Troels Nielsen <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Tue 2012-05-29 20:22:49 +0800
message:
Fix active minibuffer case for window-deletable-p.
* window.el (window-deletable-p): Avoid deleting the root window
of a frame with an active minibuffer.
modified:
lisp/ChangeLog
lisp/window.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2012-05-29 12:21:45 +0000
+++ b/lisp/ChangeLog 2012-05-29 12:22:49 +0000
@@ -1,3 +1,8 @@
+2012-05-29 Troels Nielsen <address@hidden>
+
+ * window.el (window-deletable-p): Avoid deleting the root window
+ of a frame with an active minibuffer.
+
2012-05-29 Martin Rudalics <address@hidden>
* simple.el (choose-completion): Use quit-window (Bug#11567).
=== modified file 'lisp/window.el'
--- a/lisp/window.el 2012-05-04 23:16:47 +0000
+++ b/lisp/window.el 2012-05-29 12:22:49 +0000
@@ -2370,8 +2370,11 @@
(cond
((frame-root-window-p window)
;; WINDOW's frame can be deleted only if there are other frames
- ;; on the same terminal.
- (unless (eq frame (next-frame frame 0))
+ ;; on the same terminal, and it does not contain the active
+ ;; minibuffer.
+ (unless (or (eq frame (next-frame frame 0))
+ (let ((minibuf (active-minibuffer-window)))
+ (and minibuf (eq frame (window-frame minibuf)))))
'frame))
((or ignore-window-parameters
(not (eq (window-parameter window 'window-side) 'none))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r108421: Fix active minibuffer case for window-deletable-p.,
Chong Yidong <=