# 
# 
# patch "ChangeLog"
#  from [289125e9dc854f85835d1a97361b65e5b7601fe3]
#    to [e34e00af57b4ea2031e554742b5bf7f560ea6207]
# 
# patch "cmd_automate.cc"
#  from [1b4c1c38d90832f658809659233949b4e186df95]
#    to [834b547cc0228a16dbb9d89626e143491c7ec266]
# 
============================================================
--- ChangeLog	289125e9dc854f85835d1a97361b65e5b7601fe3
+++ ChangeLog	e34e00af57b4ea2031e554742b5bf7f560ea6207
@@ -1,3 +1,9 @@
+2006-10-13  Timothy Brownawell  <address@hidden>
+
+	Revert automate stdio extensions (never were on mainline) so
+	that the only change is that automate stdio is implemented
+	more cleanly.
+
 2006-10-12  Thomas Keller <address@hidden>
 
 	* automate.cc: replaced std::endl in favour of simple unix
============================================================
--- cmd_automate.cc	1b4c1c38d90832f658809659233949b4e186df95
+++ cmd_automate.cc	834b547cc0228a16dbb9d89626e143491c7ec266
@@ -12,7 +12,7 @@
 #include <map>
 #include <utility>
 
-#include <boost/function.hpp>
+//#include <boost/function.hpp>
 #include <boost/bind.hpp>
 
 #include "cmd.hh"
@@ -48,15 +48,14 @@ automate_command(utf8 cmd, vector<utf8> 
 automate_command(utf8 cmd, vector<utf8> args,
                  string const & root_cmd_name,
                  app_state & app,
-                 ostream & output/*,
-                 istream & input*/)
+                 ostream & output)
 {
   map<string, automation::automate * const>::const_iterator
     i = automation::automations->find(cmd());
   if (i == automation::automations->end())
     throw usage(root_cmd_name);
   else
-    i->second->run(args, root_cmd_name, app, output/*, input*/);
+    i->second->run(args, root_cmd_name, app, output);
 }
 
 static string const interface_version = "3.1";
@@ -364,7 +363,6 @@ CMD_PARAMS_FN(automate, N_("automation")
 
   make_io_binary();
 
-//  automate_command(cmd, cmd_args, name, app, std::cout, std::cin);
   automate_command(cmd, cmd_args, name, app, std::cout);
 }