# 
# patch "ChangeLog"
#  from [70be6b18ce1f5a088e894dbbc3ea97cb1184d5eb]
#    to [14d87795a9fa061d6bf1d273983967a321ac373a]
# 
# patch "std_hooks.lua"
#  from [106c040e734e7988d7379c62259b90505f876db1]
#    to [8cbb4fa7ba6b6cc3fbbd85d1bb4eee5f39ab6fc1]
# 
========================================================================
--- ChangeLog	70be6b18ce1f5a088e894dbbc3ea97cb1184d5eb
+++ ChangeLog	14d87795a9fa061d6bf1d273983967a321ac373a
@@ -1,5 +1,10 @@
 2005-11-27  Nathaniel Smith  <address@hidden>
 
+	* std_hooks.lua: Make regexp matching error slightly more
+	user-friendly.
+
+2005-11-27  Nathaniel Smith  <address@hidden>
+
 	* commands.cc (diff): Remove OPT_BRANCH from diff's options.
 
 2005-11-27  Julio M. Merino Vidal  <address@hidden>
========================================================================
--- std_hooks.lua	106c040e734e7988d7379c62259b90505f876db1
+++ std_hooks.lua	8cbb4fa7ba6b6cc3fbbd85d1bb4eee5f39ab6fc1
@@ -94,8 +94,8 @@
           if result == true then return true end
       else
           -- regex.search had a problem, warn the user their .mt-ignore file syntax is wrong
-          io.stderr:write("WARNING: the line '" .. line .. "' in your .mt-ignore file caused exception '" .. result .. "'"
-                           .. " while matching filename '" .. name .. "', ignoring this regex for all remaining files.\n")
+          io.stderr:write("WARNING: the line '" .. line .. "' in your .mt-ignore file caused error '" .. result .. "'"
+                           .. " while matching filename '" .. name .. "'.\nignoring this regex for all remaining files.\n")
           table.remove(ignored_files, i)
       end
    end