# 
# 
# patch "ChangeLog"
#  from [2ea5aca2a64eafecb09594b4155c91ea2c1b03d9]
#    to [d43c7628591e6e58648dabbf297fec922fd99436]
# 
# patch "commands.cc"
#  from [bc9dc6d2d7a8cd640ede66fb4648e67271da61fa]
#    to [fd8000cbe01cd09fbaa804c823e5b73339eb766f]
# 
# patch "std_hooks.lua"
#  from [e2c6dd278aca2d0a6df60cf0dc9dbf353eef64d7]
#    to [fbc926cf5b9a833b55bd1c7a3792a98f93b15493]
# 
============================================================
--- ChangeLog	2ea5aca2a64eafecb09594b4155c91ea2c1b03d9
+++ ChangeLog	d43c7628591e6e58648dabbf297fec922fd99436
@@ -1,5 +1,10 @@
 2006-03-28  Nathaniel Smith  <address@hidden>
 
+	* commands.cc (get_log_message_interactively): 
+	* std_hooks.lua (edit_comment): s/MT:/MTN:/
+
+2006-03-28  Nathaniel Smith  <address@hidden>
+
 	* paths.cc: s/MT/_MTN/ everywhere.
 	(in_bookkeeping_dir): Also apply the security kluge from 0.25.2,
 	where we define the bookkeeping dir case-insensitively.
============================================================
--- commands.cc	bc9dc6d2d7a8cd640ede66fb4648e67271da61fa
+++ commands.cc	fd8000cbe01cd09fbaa804c823e5b73339eb766f
@@ -425,7 +425,7 @@
   read_user_log(user_log_message);
   commentary += "----------------------------------------------------------------------\n";
   commentary += _("Enter a description of this change.\n"
-                  "Lines beginning with `MT:' are removed automatically.\n");
+                  "Lines beginning with `MTN:' are removed automatically.\n");
   commentary += "\n";
   commentary += summary();
   commentary += "----------------------------------------------------------------------\n";
============================================================
--- std_hooks.lua	e2c6dd278aca2d0a6df60cf0dc9dbf353eef64d7
+++ std_hooks.lua	fbc926cf5b9a833b55bd1c7a3792a98f93b15493
@@ -203,7 +203,7 @@
 
    local tmp, tname = temp_file()
    if (tmp == nil) then return nil end
-   basetext = "MT: " .. string.gsub(basetext, "\n", "\nMT: ") .. "\n"
+   basetext = "MTN: " .. string.gsub(basetext, "\n", "\nMTN: ") .. "\n"
    if user_log_message == "" then
       tmp:write("\n")
    else
@@ -224,7 +224,7 @@
    local res = ""
    local line = tmp:read()
    while(line ~= nil) do 
-      if (not string.find(line, "^MT:")) then
+      if (not string.find(line, "^MTN:")) then
          res = res .. line .. "\n"
       end
       line = tmp:read()