Show
Ignore:
Timestamp:
09/09/06 16:30:10 (2 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lisp/desktop.el

    r4098 r4161  
    863863      (let ((desktop-first-buffer nil) 
    864864            (desktop-buffer-ok-count 0) 
    865             (desktop-buffer-fail-count 0)) 
    866         (setq desktop-lazy-timer nil) 
     865            (desktop-buffer-fail-count 0) 
     866            desktop-save) 
     867        (desktop-lazy-abort) 
    867868        ;; Evaluate desktop buffer. 
    868869        (load (desktop-full-file-name) t t t)