[Emacs-diffs] trunk r113531: lisp/desktop.el (desktop-restoring-frames-p): Return a true boolean.

[Juanma Barranquero]

------------------------------------------------------------
revno: 113531
revision-id: address@hidden
parent: address@hidden
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Wed 2013-07-24 18:21:44 +0200
message:
  lisp/desktop.el (desktop-restoring-frames-p): Return a true boolean.
  (desktop-restore-frames): Warn when deleting an existing frame failed.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/desktop.el                desktop.el-20091113204419-o5vbwnq5f7feedwu-591

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-07-24 15:56:24 +0000
+++ b/lisp/ChangeLog    2013-07-24 16:21:44 +0000
@@ -1,3 +1,8 @@
+2013-07-24  Juanma Barranquero  <address@hidden>
+
+       * 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  <address@hidden>
 
        * ffap.el (ffap-machine-p): Handle "not known" response.  (Bug#14929)

=== modified file 'lisp/desktop.el'
--- a/lisp/desktop.el   2013-07-23 23:10:58 +0000
+++ b/lisp/desktop.el   2013-07-24 16:21:44 +0000
@@ -1327,7 +1327,7 @@
 
 (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 @@
       ;; 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)