#
# patch "ChangeLog"
#  from [777ca01f03e75cdb7cd33e67cb3b5453df7046bb]
#    to [46151b6877af69529b9288b64eab4e91ca5526ed]
#
# patch "basic_io.cc"
#  from [59d07d48475fc4a7d1a5301f162fdb7245bbab62]
#    to [3c575f5fd41d00730c3a0a9eafe84105fa51f28a]
#
========================================================================
--- ChangeLog	777ca01f03e75cdb7cd33e67cb3b5453df7046bb
+++ ChangeLog	46151b6877af69529b9288b64eab4e91ca5526ed
@@ -1,3 +1,7 @@
+2005-08-31  Benoît Dejean  <address@hidden>
+
+	* basic_io.cc (basic_io::input_source::err): Merged strings.
+
 2005-08-31  Nathaniel Smith  <address@hidden>

 	* file_io.cc (set_char_is_binary, guess_binary): static_cast chars
========================================================================
--- basic_io.cc	59d07d48475fc4a7d1a5301f162fdb7245bbab62
+++ basic_io.cc	3c575f5fd41d00730c3a0a9eafe84105fa51f28a
@@ -24,7 +24,7 @@
 void basic_io::input_source::err(std::string const & s)
 {
   L(F("error in %s:%d:%d:E: %s") % name % line % col % s);
-  throw informative_failure((F("%s:%d:%d:E: %s")
+  throw informative_failure((F("error in %s:%d:%d:E: %s")
                              % name % line % col % s).str());
 }