procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lisp/desktop.el (desktop-restoring-frames-p): Return a true boolean.

Browse source 
(desktop-restore-frames): Warn when deleting an existing frame failed.
This commit is contained in:
Juanma Barranquero 2013-07-24 18:21:44 +02:00
parent 86c4097015
commit 889acc5ce7
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2013-07-24 Juanma Barranquero <lekktu@gmail.com>
* desktop.el (desktop-restoring-frames-p): Return a true boolean.
(desktop-restore-frames): Warn when deleting an existing frame failed.
2013-07-24 Glenn Morris <rgm@gnu.org>
* ffap.el (ffap-machine-p): Handle "not known" response. (Bug#14929)

7
lisp/desktop.el
View file

@ -1327,7 +1327,7 @@ its window state. Internal use only."
(defun desktop-restoring-frames-p ()
"True if calling `desktop-restore-frames' will actually restore frames."
(and desktop-restore-frames desktop-saved-frame-states))
(and desktop-restore-frames desktop-saved-frame-states t))
(defun desktop-restore-frames ()
"Restore window/frame configuration.
@ -1405,7 +1405,10 @@ being set (usually, by reading it from the desktop)."
;; Delete remaining frames, but do not fail if some resist being deleted.
(unless (eq desktop-restoring-reuses-frames 'keep)
(dolist (frame desktop--reuse-list)
(ignore-errors (delete-frame frame))))
(condition-case err
(delete-frame frame)
(error
(delay-warning 'desktop (error-message-string err))))))
(setq desktop--reuse-list nil)
;; Make sure there's at least one visible frame, and select it.
(unless (or (daemonp)