diff options
| author | Martin Rudalics <rudalics@gmx.at> | 2012-06-26 09:13:40 +0200 |
|---|---|---|
| committer | Martin Rudalics <rudalics@gmx.at> | 2012-06-26 09:13:40 +0200 |
| commit | 5cf983b29d92c0c5d90b233d2c25f4f5defb60be (patch) | |
| tree | 4047508877a8f6658297aa0aa195bb9468d447bc /lisp | |
| parent | 42997f4d4fb5614157f8f798286787c5d2976fb6 (diff) | |
| download | emacs-5cf983b29d92c0c5d90b233d2c25f4f5defb60be.tar.gz emacs-5cf983b29d92c0c5d90b233d2c25f4f5defb60be.tar.bz2 emacs-5cf983b29d92c0c5d90b233d2c25f4f5defb60be.zip | |
In calendar-exit don't try to delete or iconify last frame.
* calendar/calendar.el (calendar-exit): Don't try to delete or
iconify last frame. See:
http://lists.gnu.org/archive/html/emacs-devel/2012-06/msg00372.html
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/calendar/calendar.el | 9 |
2 files changed, 11 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 02c81a1018d..ac24259869a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2012-06-26 Martin Rudalics <rudalics@gmx.at> + + * calendar/calendar.el (calendar-exit): Don't try to delete or + iconify last frame. See: + http://lists.gnu.org/archive/html/emacs-devel/2012-06/msg00372.html + 2012-06-25 Jim Diamond <Jim.Diamond@AcadiaU.ca> (tiny change) * server.el (server-process-filter): Remember dir in the diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index c47bbdff5ec..d5514d14a32 100644 --- a/lisp/calendar/calendar.el +++ b/lisp/calendar/calendar.el @@ -1818,10 +1818,11 @@ the STRINGS are just concatenated and the result truncated." (dolist (w (window-list-1 nil nil t)) (if (and (memq (window-buffer w) calendar-buffers) (window-dedicated-p w)) - (if calendar-remove-frame-by-deleting - (delete-frame (window-frame w)) - (iconify-frame (window-frame w))) - (quit-window kill w))) + (if (eq (window-deletable-p w) 'frame) + (if calendar-remove-frame-by-deleting + (delete-frame (window-frame w)) + (iconify-frame (window-frame w))) + (quit-window kill w)))) (dolist (b calendar-buffers) (quit-windows-on b kill)))))) |