Re: Problem with desktop.el

[David Kastrup <dak@gnu.org>]

[-- Attachment #1: Type: text/plain, Size: 562 bytes --]

David Kastrup <dak@gnu.org> writes:

> Richard Stallman <rms@gnu.org> 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:


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 893 bytes --]

*** 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.

[-- Attachment #3: Type: text/plain, Size: 51 bytes --]


-- 
David Kastrup, Kriemhildstr. 15, 44793 Bochum

[-- Attachment #4: Type: text/plain, Size: 142 bytes --]

_______________________________________________
Emacs-devel mailing list
Emacs-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-devel