bug#24298: Acknowledgement (25.1; problem with restoring desktop)

[John Covici]

Preliminary testing indicates its good,  I will try with latest master
and see what happens.

Thanks.

On Sat, 17 Dec 2016 08:11:59 -0500,
Eli Zaretskii wrote:
> 
> diff --git a/lisp/desktop.el b/lisp/desktop.el
> index 1f460b7..e83891b 100644
> --- a/lisp/desktop.el
> +++ b/lisp/desktop.el
> @@ -1157,13 +1157,13 @@ desktop-lazy-timer
>  ;; 
> ----------------------------------------------------------------------------
>  (defun desktop-restoring-frameset-p ()
>    "True if calling `desktop-restore-frameset' will actually restore it."
> -  (and desktop-restore-frames desktop-saved-frameset t))
> +  (and desktop-restore-frames desktop-saved-frameset (display-graphic-p) t))
>  
>  (defun desktop-restore-frameset ()
>    "Restore the state of a set of frames.
>  This function depends on the value of `desktop-saved-frameset'
>  being set (usually, by reading it from the desktop)."
> -  (when (and (display-graphic-p) (desktop-restoring-frameset-p))
> +  (when (desktop-restoring-frameset-p)
>      (frameset-restore desktop-saved-frameset
>                     :reuse-frames (eq desktop-restore-reuses-frames t)
>                     :cleanup-frames (not (eq desktop-restore-reuses-frames 
> 'keep))

-- 
Your life is like a penny.  You're going to lose it.  The question is:
How do
you spend it?

         John Covici
         covici@ccs.covici.com