From: Juanma Barranquero Date: Wed, 24 Jul 2013 16:21:44 +0000 (+0200) Subject: lisp/desktop.el (desktop-restoring-frames-p): Return a true boolean. X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1703 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=889acc5ce746cfef19655537557fe32d461057ad;p=emacs.git lisp/desktop.el (desktop-restoring-frames-p): Return a true boolean. (desktop-restore-frames): Warn when deleting an existing frame failed. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a85c8c19546..587c9b921c9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-07-24 Juanma Barranquero + + * 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 * ffap.el (ffap-machine-p): Handle "not known" response. (Bug#14929) diff --git a/lisp/desktop.el b/lisp/desktop.el index 0cbe38c29e1..f4622ae4961 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -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)