# 
# patch "ChangeLog"
#  from [2aefa27e70d5c80c2458a8a9192f9b840b93b571]
#    to [69955d161199f61a262d1d4c050f8d151b5352e7]
# 
# patch "app_state.cc"
#  from [a48e3316e58760390f478e34ca33a5475867d330]
#    to [a5688247013ce25016c11677c8c5846a898dcfda]
# 
# patch "automate.cc"
#  from [de5a69d2183076a45f2d5801fc81edea951e928c]
#    to [a4430e32aaef1d9c7890b31605b0f3944e34d082]
# 
# patch "paths.hh"
#  from [47fe415dfa8a572a5bc065b5f07f98e48a2259a2]
#    to [97c11df05bcd28e529c7e22c01cdaa6a5dad3fc6]
# 
========================================================================
--- ChangeLog	2aefa27e70d5c80c2458a8a9192f9b840b93b571
+++ ChangeLog	69955d161199f61a262d1d4c050f8d151b5352e7
@@ -1,5 +1,9 @@
 2005-08-24  Nathaniel Smith  <address@hidden>
 
+	* paths.hh (file_path_external): Take a utf8() object, always.
+
+2005-08-24  Nathaniel Smith  <address@hidden>
+
 	* paths.hh (class file_path): Make "convenience functions"
 	required.
 
========================================================================
--- app_state.cc	a48e3316e58760390f478e34ca33a5475867d330
+++ app_state.cc	a5688247013ce25016c11677c8c5846a898dcfda
@@ -175,7 +175,7 @@
   // assume current directory
   if ((depth != -1) && restrictions.empty()) 
     {
-      restrictions.insert(file_path_external("."));
+      restrictions.insert(file_path_external(utf8(".")));
     }
 }
 
========================================================================
--- automate.cc	de5a69d2183076a45f2d5801fc81edea951e928c
+++ automate.cc	a4430e32aaef1d9c7890b31605b0f3944e34d082
@@ -237,7 +237,7 @@
 
   if (args.size() == 1) {
     // a filename was given, if it has attributes, print them
-    file_path path = file_path_external(idx(args,0)());
+    file_path path = file_path_external(idx(args,0));
     attr_map::const_iterator i = attrs.find(path);
     if (i == attrs.end()) return;
 
========================================================================
--- paths.hh	47fe415dfa8a572a5bc065b5f07f98e48a2259a2
+++ paths.hh	97c11df05bcd28e529c7e22c01cdaa6a5dad3fc6
@@ -90,9 +90,9 @@
 {
   return file_path(file_path::internal, path);
 }
-inline file_path file_path_external(std::string const & path)
+inline file_path file_path_external(utf8 const & path)
 {
-  return file_path(file_path::external, path);
+  return file_path(file_path::external, path());
 }