[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r106025: Delete dedicated frame when
From: |
martin rudalics |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r106025: Delete dedicated frame when killing its buffer. (Bug#9699) |
Date: |
Sat, 08 Oct 2011 15:52:16 +0200 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 106025
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Sat 2011-10-08 15:52:16 +0200
message:
Delete dedicated frame when killing its buffer. (Bug#9699)
* window.el (window--delete): Delete dedicated frame unconditionally
when argument KILL is non-nil. (Bug#9699)
modified:
lisp/ChangeLog
lisp/window.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-10-08 06:08:00 +0000
+++ b/lisp/ChangeLog 2011-10-08 13:52:16 +0000
@@ -1,3 +1,8 @@
+2011-10-08 Martin Rudalics <address@hidden>
+
+ * window.el (window--delete): Delete dedicated frame
+ unconditionally when argument KILL is non-nil. (Bug#9699)
+
2011-10-08 Thierry Volpiatto <address@hidden>
* lisp/eshell/eshell.el (eshell-command): Avoid using hooks.
=== modified file 'lisp/window.el'
--- a/lisp/window.el 2011-10-05 08:59:13 +0000
+++ b/lisp/window.el 2011-10-08 13:52:16 +0000
@@ -2780,7 +2780,7 @@
Optional argument DEDICATED-ONLY non-nil means to delete WINDOW
only if it's dedicated to its buffer. Optional argument KILL
means the buffer shown in window will be killed. Return non-nil
-if WINDOW gets deleted."
+if WINDOW gets deleted or its frame is auto-hidden."
(setq window (window-normalize-live-window window))
(unless (and dedicated-only (not (window-dedicated-p window)))
(let* ((buffer (window-buffer window))
@@ -2788,8 +2788,11 @@
(cond
((eq deletable 'frame)
(let ((frame (window-frame window)))
- (when (functionp frame-auto-hide-function)
- (funcall frame-auto-hide-function frame)))
+ (cond
+ (kill
+ (delete-frame frame))
+ ((functionp frame-auto-hide-function)
+ (funcall frame-auto-hide-function frame))))
'frame)
(deletable
(delete-window window)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r106025: Delete dedicated frame when killing its buffer. (Bug#9699),
martin rudalics <=