Re: Problem with desktop.el

[David Kastrup]

David Kastrup <address@hidden> writes:

> Richard Stallman <address@hidden> writes:
>
>>     There are two problems here, I think.  One is that a desktop was saved
>>     while loading it was still in progress.
>>
>> It should be easy to prevent with an explicit test: don't save the
>> desktop when in the middle of reading one.  Could you write the code
>> to do that?
>
> I think maybe the following would do the trick:

I have added another change, since it looks like otherwise we might
get a timer leak.

I am checking in the following change then, all in all:

*** desktop.el  25 Jun 2006 14:24:14 +0200      1.102
--- desktop.el  08 Sep 2006 21:36:39 +0200      
***************
*** 862,869 ****
        ;; Desktop file found, process it.
        (let ((desktop-first-buffer nil)
              (desktop-buffer-ok-count 0)
!             (desktop-buffer-fail-count 0))
!         (setq desktop-lazy-timer nil)
          ;; Evaluate desktop buffer.
          (load (desktop-full-file-name) t t t)
          ;; `desktop-create-buffer' puts buffers at end of the buffer list.
--- 862,870 ----
        ;; Desktop file found, process it.
        (let ((desktop-first-buffer nil)
              (desktop-buffer-ok-count 0)
!             (desktop-buffer-fail-count 0)
!           desktop-save)
!       (desktop-lazy-abort)
          ;; Evaluate desktop buffer.
          (load (desktop-full-file-name) t t t)
          ;; `desktop-create-buffer' puts buffers at end of the buffer list.

-- 
David Kastrup, Kriemhildstr. 15, 44793 Bochum