aboutsummaryrefslogtreecommitdiffstats
path: root/doc/emacs
diff options
context:
space:
mode:
Diffstat (limited to 'doc/emacs')
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/misc.texi3
2 files changed, 7 insertions, 0 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 63de0aafc0..b4b03da88d 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-02 Glenn Morris <[email protected]>
+
+ * misc.texi (Saving Emacs Sessions): Mention desktop-path. (Bug#6948)
+
2010-08-21 Glenn Morris <[email protected]>
* misc.texi (Amusements): Mention bubbles and animate.
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index 029cf41066..ea4b39bdec 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -2349,8 +2349,11 @@ sessions, or add this line in your init file (@pxref{Init File}):
@findex desktop-change-dir
@findex desktop-revert
+@vindex desktop-path
If you turn on @code{desktop-save-mode} in your init file, then when
Emacs starts, it looks for a saved desktop in the current directory.
+(More precisely, it looks in the directories specified by
+@var{desktop-path}, and uses the first desktop it finds.)
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 another directory