Re: desktop and misc.texi

[Alex Schroeder <alex@emacswiki.org>]

Lars Hansen <larsh@math.ku.dk> writes:

> I agree, so pleese go ahead.

I have appended two patches, one for misc.texi and one for desktop.el.
I don't think any ChangeLog entries are required, because these are
mostly doc changes.

I also changed one (eq desktop-save 't) to (eq desktop-save t); I
think that should be harmless.

If you agree with these changes, I can commit them.

Alex.



*** misc.texi.~1.43.~	2003-06-09 23:41:30.000000000 +0200
--- misc.texi	2003-08-16 15:50:33.000000000 +0200
***************
*** 1888,1903 ****
  @example
  (desktop-load-default)
  (desktop-read)
  @end example
  
  @noindent
  @findex desktop-save
! The first time you save the state of the Emacs session, you must do it
! manually, with the command @kbd{M-x desktop-save}.  Once you have done
! that, exiting Emacs will save the state again---not only the present
! Emacs session, but also subsequent sessions.  You can also save the
! state at any time, without exiting Emacs, by typing @kbd{M-x
! desktop-save} again.
  
    In order for Emacs to recover the state from a previous session, you
  must start it with the same current directory as you used when you
--- 1888,1902 ----
  @example
  (desktop-load-default)
  (desktop-read)
+ (setq desktop-enable t)
  @end example
  
  @noindent
  @findex desktop-save
! The first time you exit Emacs, you will be asked whether you want to
! save your session.  Once you have done that, exiting Emacs will save
! the state again in subsequent sessions.  You can also save the state
! at any time, without exiting Emacs, by typing @kbd{M-x desktop-save}.
  
    In order for Emacs to recover the state from a previous session, you
  must start it with the same current directory as you used when you




*** desktop.el.~1.58.~	2003-06-09 23:40:37.000000000 +0200
--- desktop.el	2003-08-16 15:52:47.000000000 +0200
***************
*** 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