3 files changed, 12 insertions, 3 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index 9980175fe56..98571380fc3 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,10 @@
+2006-09-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * faq.texi (Escape sequences in shell output): EMACS is now set
+        to Emacs's absolute file name, not to "t".
+        (^M in the shell buffer): Likewise.
+        * misc.texi (Interactive Shell): Likewise.
+
 2006-09-11  Richard Stallman  <rms@gnu.org>
 
         * building.texi (Compilation Mode): Clarification.
diff --git a/man/faq.texi b/man/faq.texi
index 54be5f38a65..1230fff62bb 100644
--- a/man/faq.texi
+++ b/man/faq.texi
@@ -2683,7 +2683,8 @@ shell init file.  You have two alternatives to solve this:
 @item
 Make the alias conditioned on the @code{EMACS} variable in the
 environment.  When Emacs runs a subsidiary shell, it exports the
-@code{EMACS} variable with the value @code{t} to that shell.  You can
+@code{EMACS} variable to that shell, with value equal to the absolute
+file name of Emacs.  You can
 unalias @code{ls} when that happens, thus limiting the alias to your
 interactive sessions.
 
@@ -2753,7 +2754,7 @@ file:
 
 @example
 if ($?EMACS) then
-    if ("$EMACS" == t) then
+    if ("$EMACS" =~ /*) then
         if ($?tcsh) unset edit
         stty nl
     endif
diff --git a/man/misc.texi b/man/misc.texi
index f6fb5edfbdb..839e8bc88b3 100644
--- a/man/misc.texi
+++ b/man/misc.texi
@@ -488,7 +488,8 @@ Coding}.
 
 @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
+Emacs defines it in the subshell, with value equal to Emacs's absolute
+file name.  A shell script
 can check this variable to determine whether it has been run from an
 Emacs subshell.