Merge from origin/emacs-25

[gnu-emacs] / etc / PROBLEMS

diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index f61921a65629bd7eb0fe73ba85e11611d56fe491..2ccb77113769cc9a6f446548f4bbbc96ef8c85af 100644 (file)
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -459,11 +459,9 @@ smart.  It sees that the Shell uses terminal type 'unknown' and turns
 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" =~ /*) then
-            unset edit
-            stty  -icrnl -onlcr -echo susp ^Z
-        endif
+    if ($?INSIDE_EMACS && $?tcsh)
+        unset edit
+        stty -icrnl -onlcr -echo susp ^Z
     endif
 
 *** Emacs startup on GNU/Linux systems (and possibly other systems) is slow.