[Emacs-diffs] Changes to emacs/lisp/desktop.el

[Alex Schroeder]

Index: emacs/lisp/desktop.el
diff -c emacs/lisp/desktop.el:1.60 emacs/lisp/desktop.el:1.61
*** emacs/lisp/desktop.el:1.60  Sun Jul 13 13:20:00 2003
--- emacs/lisp/desktop.el       Sun Aug 17 05:32:10 2003
***************
*** 37,54 ****
  ;;            - buffer-read-only
  ;;            - some local variables
  
! ;; To use this, first put these two lines in the bottom of your .emacs
! ;; file (the later the better):
  ;;
  ;;    (desktop-load-default)
  ;;    (desktop-read)
  ;;
! ;; Between these two lines you may wish to add something that updates the
  ;; variables `desktop-globals-to-save' and/or `desktop-locals-to-save'.  If
  ;; for instance you want to save the local variable `foobar' for every buffer
  ;; in which it is local, you could add the line
  ;;
! ;;    (setq desktop-locals-to-save (cons 'foobar desktop-locals-to-save))
  ;;
  ;; To avoid saving excessive amounts of data you may also wish to add
  ;; something like the following
--- 37,54 ----
  ;;            - buffer-read-only
  ;;            - some local variables
  
! ;; To use this, add these lines in the bottom of your .emacs file:
  ;;
  ;;    (desktop-load-default)
  ;;    (desktop-read)
+ ;;      (setq desktop-enable t)
  ;;
! ;; Between the first two lines you may wish to add something that updates the
  ;; variables `desktop-globals-to-save' and/or `desktop-locals-to-save'.  If
  ;; for instance you want to save the local variable `foobar' for every buffer
  ;; in which it is local, you could add the line
  ;;
! ;;    (add-to-list 'desktop-locals-to-save 'foobar)
  ;;
  ;; To avoid saving excessive amounts of data you may also wish to add
  ;; something like the following
***************
*** 397,403 ****
        desktop-enable
        (let ((exists (file-exists-p (expand-file-name desktop-base-file-name 
desktop-dirname))))
          (or
!           (eq desktop-save 't)
            (and exists (memq desktop-save '(ask-if-new if-exists)))
            (and
              (or
--- 397,403 ----
        desktop-enable
        (let ((exists (file-exists-p (expand-file-name desktop-base-file-name 
desktop-dirname))))
          (or
!           (eq desktop-save t)
            (and exists (memq desktop-save '(ask-if-new if-exists)))
            (and
              (or