Show
Ignore:
Timestamp:
09/18/06 20:48:14 (2 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lisp/desktop.el

    r4161 r4166  
    864864            (desktop-buffer-ok-count 0) 
    865865            (desktop-buffer-fail-count 0) 
    866             desktop-save) 
     866            ;; Avoid desktop saving during evaluation of desktop buffer. 
     867            (desktop-save nil)) 
    867868        (desktop-lazy-abort) 
    868869        ;; Evaluate desktop buffer.