#
#
# patch "win32/terminal.cc"
#  from [f1c5d626b33b20a2598717dae3498308adbe965a]
#    to [f695bcc3b73c50c76b63e0cfc30e3fb7bf2d9876]
# 
# patch "work.cc"
#  from [8036882e43a0c0dc71798cea7d5931b17808a84c]
#    to [772e23f689e6523ca680a9dcd5d5889637eeb816]
#
============================================================
--- win32/terminal.cc	f1c5d626b33b20a2598717dae3498308adbe965a
+++ win32/terminal.cc	f695bcc3b73c50c76b63e0cfc30e3fb7bf2d9876
@@ -22,7 +22,7 @@ bool have_smart_terminal()
   // 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.
   // Let's just check for some obvious dumb terminals, and default to smart.
-  if (term == "emacs" || term == "dumb")
+  if (term == "" || term == "dumb")
     return false;
   else
     return true;
@@ -39,7 +39,7 @@ unsigned int terminal_width()
           return static_cast<unsigned int>(ci.dwSize.X);
         }
     }
-  
+
   // default to 80 columns if the width query failed.
   return 80;
 }
============================================================
--- work.cc	8036882e43a0c0dc71798cea7d5931b17808a84c
+++ work.cc	772e23f689e6523ca680a9dcd5d5889637eeb816
@@ -445,7 +445,6 @@ workspace::get_ws_options(options & opts
   // Workspace options are not to override the command line.
   if (!opts.dbname_given)
     {
-      I(opts.dbname.empty());
       opts.dbname = database_option;
     }