# 
# patch "ChangeLog"
#  from [3744baa9157af8704734b41924b96acf50211dce]
#    to [0c2b9b019d8e0d9440074af1db437cd3b7a143c1]
# 
# patch "win32/terminal.cc"
#  from [e79234a8f5c29f47deae3d84703a2792678b6e74]
#    to [3eb6dc1cb604200139e367919e66a7438a986a6c]
# 
========================================================================
--- ChangeLog	3744baa9157af8704734b41924b96acf50211dce
+++ ChangeLog	0c2b9b019d8e0d9440074af1db437cd3b7a143c1
@@ -1,3 +1,9 @@
+2005-09-05  Matthew Gregan  <address@hidden>
+
+	* win32/terminal.cc (have_smart_terminal): We were returning false
+	in almost all circumstances; changed logic so that we at least
+	work when running in a cmd.exe window.
+
 2005-09-05  Matt Johnston  <address@hidden>
 
 	* commands.cc (dump_diffs): don't use the terminal width to
========================================================================
--- win32/terminal.cc	e79234a8f5c29f47deae3d84703a2792678b6e74
+++ win32/terminal.cc	3eb6dc1cb604200139e367919e66a7438a986a6c
@@ -19,8 +19,9 @@
   else
     term = "";
 
-  if (term == "" || term == "emacs" || term == "dumb"
-      || !_isatty(_fileno(stderr)))
+  // Win32 consoles are weird; cmd.exe does not set TERM, but isatty returns
+  // true, Cygwin and MinGW MSYS shells set a TERM but isatty returns false.
+  if (term == "emacs" || term == "dumb" || !isatty(fileno(stderr)))
     return false;
   else
     return true;