3 files changed, 17 insertions, 2 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index d3e5e2cfdf6..e236643da10 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,6 +1,13 @@
+2006-09-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * NEWS: In terminal-oriented subshells, the EMACS environment
+        variable now defaults to Emacs's absolute file name, instead of
+        to "t".
+        * PROBLEMS: Adjust tcsh advice for this.
+
 2006-09-10  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
-        * PROBLEMS (are): Emacs compiled with Gtk+ crashes when closing a 
+        * PROBLEMS (are): Emacs compiled with Gtk+ crashes when closing a
         display (x-close-connection).
 
 2006-09-02  Juri Linkov  <juri@jurta.org>
diff --git a/etc/NEWS b/etc/NEWS
index 1c1f55d48f3..f2a6b5cb10e 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1434,6 +1434,10 @@ otherwise behaves quite similarly to the bash version.
 `comint-use-prompt-regexp'.  The old name has been kept as an alias,
 but declared obsolete.
 
++++
+*** The EMACS environment variable now defaults to Emacs's absolute
+file name, instead of to "t".
+
 ** M-x Compile changes:
 
 ---
@@ -1490,6 +1494,10 @@ it doesn't scroll the compilation output window.  If there is no left fringe,
 no arrow is displayed and a value of nil means display the message at the top
 of the window.
 
++++
+*** The EMACS environment variable now defaults to Emacs's absolute
+file name, instead of to "t".
+
 ** Occur mode changes:
 
 +++
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 06ef3a880aa..f42f62a3332 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -540,7 +540,7 @@ on the flag to output ^M at the end of each line.  You can fix the
 problem by adding this to your .cshrc file:
 
     if ($?EMACS) then
-        if ($EMACS == "t") then
+        if ("$EMACS" =~ /*) then
             unset edit
             stty  -icrnl -onlcr -echo susp ^Z
         endif