# 
# 
# patch "ChangeLog"
#  from [8f8c9cd0d722ecd5c74d89e94822638660fab84d]
#    to [92f6cb878cf8a7b90a8a6267967baec044888346]
# 
# patch "monotone.cc"
#  from [0558cb8c31f175d66d933e4d925efa1fda049b7f]
#    to [2b3a5cd2f5ca0478aabec59c7c770aafdc717ab2]
# 
============================================================
--- ChangeLog	8f8c9cd0d722ecd5c74d89e94822638660fab84d
+++ ChangeLog	92f6cb878cf8a7b90a8a6267967baec044888346
@@ -1,3 +1,8 @@
+2006-04-12  Matthew Gregan  <address@hidden>
+
+	* monotone.cc (cpp_main): Use the entire path leaf for prog_name,
+	but strip ".exe" off if present.
+
 2006-04-12  Richard Levitte  <address@hidden>
 
 	* ui.cc (compose_count): Simplify for count/total ticks.  There's
============================================================
--- monotone.cc	0558cb8c31f175d66d933e4d925efa1fda049b7f
+++ monotone.cc	2b3a5cd2f5ca0478aabec59c7c770aafdc717ab2
@@ -291,8 +291,12 @@
   save_initial_path();
   utf8_argv uv(argc, argv);
 
-  utf8 prog_name(fs::basename(fs::path(uv.argv[0])));
+  // find base name of executable
 
+  string prog_path = fs::path(uv.argv[0]).leaf();
+  prog_path = prog_path.substr(0, prog_path.find(".exe", 0));
+  utf8 prog_name(prog_path);
+
   // prepare for arg parsing
 
   cleanup_ptr<poptContext, void>