(Debugger Operation): Define text command mode.

[gnu-emacs] / man / misc.texi

diff --git a/man/misc.texi b/man/misc.texi
index 33c85a9fc8b0d4f44563a76c1dfd0eaff71eaaa9..d8511354577c3f81b8334f328f05aed8933355bc 100644 (file)
--- a/man/misc.texi
+++ b/man/misc.texi
@@ -486,11 +486,16 @@ also change the coding system for a running subshell by typing
 @kbd{C-x @key{RET} p} in the shell buffer.  @xref{Communication
 Coding}.
 
+@cindex @env{INSIDE_EMACS} environment variable
+  Emacs sets the envitonment variable @env{INSIDE_EMACS} to @code{t}
+in the subshell.  Programs can check this variable to determine
+whether they are running inside an Emacs subshell.
+
 @cindex @env{EMACS} environment variable
-  Unless the environment variable @env{EMACS} is already defined,
-Emacs defines it in the subshell, with value @code{t}.  A shell script
-can check this variable to determine whether it has been run from an
-Emacs subshell.
+  Emacs also sets the @env{EMACS} environment variable to @code{t} if
+it is not already defined.  @strong{Warning:} This environment
+variable is deprecated.  Programs that check this variable should be
+changed to check @env{INSIDE_EMACS} instead.
 
 @node Shell Mode
 @subsection Shell Mode
@@ -1998,11 +2003,11 @@ subsequent Emacs sessions reload the saved desktop.
 @findex desktop-save
 @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 and its restoring when Emacs starts: 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:
+desktop-save}.  You can also enable automatic saving of the desktop
+when you exit Emacs, and automatic restoration of the last saved
+desktop when Emacs starts: 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:
 
 @example
 (desktop-save-mode 1)