[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r113677: lisp/desktop.el (desktop-clear): Be more ca
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] trunk r113677: lisp/desktop.el (desktop-clear): Be more careful about deleting frames. |
Date: |
Sun, 04 Aug 2013 00:31:41 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 113677
revision-id: address@hidden
parent: address@hidden
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Sun 2013-08-04 02:31:33 +0200
message:
lisp/desktop.el (desktop-clear): Be more careful about deleting frames.
Do it only when called interactively and desktop-restore-frames is non-nil.
Doc fix.
(desktop-read): Set desktop-saved-frameset to nil.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/desktop.el desktop.el-20091113204419-o5vbwnq5f7feedwu-591
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-08-03 09:57:07 +0000
+++ b/lisp/ChangeLog 2013-08-04 00:31:33 +0000
@@ -1,3 +1,9 @@
+2013-08-04 Juanma Barranquero <address@hidden>
+
+ * desktop.el (desktop-clear): Only delete frames when called
+ interactively and desktop-restore-frames is non-nil. Doc fix.
+ (desktop-read): Set desktop-saved-frameset to nil.
+
2013-08-03 Juanma Barranquero <address@hidden>
* frameset.el (frameset-prop): New function and setter.
=== modified file 'lisp/desktop.el'
--- a/lisp/desktop.el 2013-08-02 04:33:58 +0000
+++ b/lisp/desktop.el 2013-08-04 00:31:33 +0000
@@ -643,7 +643,10 @@
"Empty the Desktop.
This kills all buffers except for internal ones and those with names matched by
a regular expression in the list `desktop-clear-preserve-buffers'.
-Furthermore, it clears the variables listed in `desktop-globals-to-clear'."
+Furthermore, it clears the variables listed in `desktop-globals-to-clear'.
+When called interactively and `desktop-restore-frames' is non-nil, it also
+deletes all frames except the selected one (and its minibuffer frame,
+if different)."
(interactive)
(desktop-lazy-abort)
(dolist (var desktop-globals-to-clear)
@@ -662,16 +665,20 @@
(string-match-p preserve-regexp bufname))
(kill-buffer buffer)))))
(delete-other-windows)
- (let* ((this (selected-frame))
- (mini (window-frame (minibuffer-window this)))) ; in case they difer
- (dolist (frame (sort (frame-list) #'frameset-sort-frames-for-deletion))
- (condition-case err
- (unless (or (eq frame this)
- (eq frame mini)
- (frame-parameter frame 'desktop-dont-clear))
- (delete-frame frame))
- (error
- (delay-warning 'desktop (error-message-string err)))))))
+ (when (and desktop-restore-frames
+ ;; Non-interactive calls to desktop-clear happen before
desktop-read
+ ;; which already takes care of frame restoration and deletion.
+ (called-interactively-p 'any))
+ (let* ((this (selected-frame))
+ (mini (window-frame (minibuffer-window this)))) ; in case they difer
+ (dolist (frame (sort (frame-list) #'frameset-sort-frames-for-deletion))
+ (condition-case err
+ (unless (or (eq frame this)
+ (eq frame mini)
+ (frame-parameter frame 'desktop-dont-clear))
+ (delete-frame frame))
+ (error
+ (delay-warning 'desktop (error-message-string err))))))))
;; ----------------------------------------------------------------------------
(unless noninteractive
@@ -1152,6 +1159,7 @@
(walk-window-tree (lambda (window)
(set-window-prev-buffers window nil)
(set-window-next-buffers window nil))))
+ (setq desktop-saved-frameset nil)
t))
;; No desktop file found.
(desktop-clear)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r113677: lisp/desktop.el (desktop-clear): Be more careful about deleting frames.,
Juanma Barranquero <=