[Emacs-diffs] Changes to emacs/man/misc.texi,v

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Eli Zaretskii <eliz>    06/08/12 12:00:31

Index: misc.texi
===================================================================
RCS file: /cvsroot/emacs/emacs/man/misc.texi,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -b -r1.90 -r1.91
--- misc.texi   24 Jul 2006 17:46:46 -0000      1.90
+++ misc.texi   12 Aug 2006 12:00:30 -0000      1.91
@@ -1999,9 +1999,10 @@
 @vindex desktop-save-mode
   You can save the desktop manually with the command @kbd{M-x
 desktop-save}.  You can also enable automatic desktop saving when
-you exit Emacs: use the Customization buffer (@pxref{Easy
-Customization}) to set @code{desktop-save-mode} to @code{t} for future
-sessions, or add this line in your @file{~/.emacs} file:
+you exit Emacs and its restoring when Emacs starts: use the
+Customization buffer (@pxref{Easy Customization}) to set
address@hidden to @code{t} for future sessions, or add this
+line in your @file{~/.emacs} file:
 
 @example
 (desktop-save-mode 1)
@@ -2009,7 +2010,8 @@
 
 @findex desktop-change-dir
 @findex desktop-revert
-  When Emacs starts, it looks for a saved desktop in the current
+  If you turn on @code{desktop-save-mode} in your @file{~/.emacs},
+then when Emacs starts, it looks for a saved desktop in the current
 directory.  Thus, you can have separate saved desktops in different
 directories, and the starting directory determines which one Emacs
 reloads.  You can save the current desktop and reload one saved in
@@ -2018,7 +2020,10 @@
 
   Specify the option @samp{--no-desktop} on the command line when you
 don't want it to reload any saved desktop.  This turns off
address@hidden for the current session.
address@hidden for the current session.  Starting Emacs with
+the @samp{--no-init-file} option also disables desktop reloading,
+since it bypasses the @file{.emacs} init file, where
address@hidden is usually turned on.
 
 @vindex desktop-restore-eager
   By default, all the buffers in the desktop are restored at one go.