# 
# patch "ChangeLog"
#  from [8c3e27d738316891c3d4dda44fe65b89edc2c149]
#    to [315e338bd2874ab0e6bc0b408b16a4623c183e88]
# 
# patch "app_state.cc"
#  from [7a6eec6df5336f398ef9a587f8ffd102b7beba2e]
#    to [40ba59f4b01affeed917ff52866c25852ad2efda]
# 
# patch "lua.cc"
#  from [8f42af379ac825a6bbfc0ab13dfd6fc4a878befa]
#    to [5de641d9087116c595d594d37d9e5f9b5e07e7b7]
# 
# patch "netsync.cc"
#  from [5fb2f9133fde0774f81d181e4450a57f5403d4e7]
#    to [de1e3b22ea660382944f0390d68ba596c7a5bd71]
# 
# patch "po/monotone.pot"
#  from [10e6d7cbad87eaa0dbe35c803cafa371567f024b]
#    to [85997f09b04320ce8cbc0972e57a3fbfb5be38da]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,10 @@
 2005-05-03  Nathaniel Smith  <address@hidden>
 
+	* netsync.cc (run_netsync_protocol): Don't use the word
+	"exception" in error messages.
+
+2005-05-03  Nathaniel Smith  <address@hidden>
+
 	* UPGRADE: Fix version number.
 
 2005-05-03  Nathaniel Smith  <address@hidden>
--- app_state.cc
+++ app_state.cc
@@ -347,7 +347,7 @@
   for (vector<utf8>::const_iterator i = extra_rcfiles.begin();
        i != extra_rcfiles.end(); ++i)
     {
-      lua.load_rcfile(mkpath((*i)()), true);
+      lua.load_rcfile(*i, true);
     }
 }
 
--- lua.cc
+++ lua.cc
@@ -479,15 +479,15 @@
   {
     if (!failed) 
       {
-	if (missing_functions.find(fname) != missing_functions.end())
-	  failed = true;
-	else
-	  {
-	    push_str(fname);
-	    get_fn();
-	    if (failed)
-	      missing_functions.insert(fname);
-	  }
+        if (missing_functions.find(fname) != missing_functions.end())
+          failed = true;
+        else
+          {
+            push_str(fname);
+            get_fn();
+            if (failed)
+              missing_functions.insert(fname);
+          }
       }
     return *this;
   }
@@ -552,6 +552,12 @@
 }
 
 
+void
+lua_hooks::load_rcfile(utf8 const & rc, bool required)
+{
+  
+}
+
 void 
 lua_hooks::load_rcfile(fs::path const & rc, bool required)
 {
--- netsync.cc
+++ netsync.cc
@@ -3456,12 +3456,12 @@
   catch (Netxx::NetworkException & e)
     {      
       end_platform_netsync();
-      throw informative_failure((F("network exception: %s") % e.what()).str());
+      throw informative_failure((F("network error: %s") % e.what()).str());
     }
   catch (Netxx::Exception & e)
     {      
       end_platform_netsync();
-      throw oops((F("trapped network exception: %s\n") % e.what()).str());;
+      throw oops((F("network error: %s\n") % e.what()).str());;
     }
   end_platform_netsync();
 }
--- po/monotone.pot
+++ po/monotone.pot
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2005-05-02 18:36-0700\n"
+"POT-Creation-Date: 2005-05-03 14:22-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"