fix regression. make the hook types be ints.

[apps/madmutt.git] / edit.c

diff --git a/edit.c b/edit.c
index f6cfcf6..93fcfa1 100644 (file)
--- a/edit.c
+++ b/edit.c
@@ -249,7 +249,7 @@ static void be_edit_header (ENVELOPE * e, int force)
     addstr ("Subject: ");
     m_strcpy(tmp, sizeof(tmp), NONULL(e->subject));
     if (mutt_enter_string (tmp, sizeof (tmp), LINES - 1, 9, 0) == 0)
-      str_replace (&e->subject, tmp);
+      m_strreplace(&e->subject, tmp);
     addch ('\n');
   }
 
@@ -297,7 +297,7 @@ int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur)
   char **buf = NULL;
   int bufmax = 0, buflen = 0;
   char tmp[LONG_STRING];
-  int abort = 0;
+  int aborted = 0;
   int done = 0;
   int i;
   char *p;
@@ -382,7 +382,7 @@ int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur)
           addstr (_("missing filename.\n"));
         break;
       case 's':
-        str_replace (&msg->env->subject, p);
+        m_strreplace(&msg->env->subject, p);
         break;
       case 't':
         msg->env->to = rfc822_parse_adrlist (msg->env->to, p);
@@ -428,7 +428,7 @@ int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur)
         be_barf_file (*p ? p : path, buf, buflen);
         break;
       case 'x':
-        abort = 1;
+        aborted = 1;
         done = 1;
         break;
       default:
@@ -448,9 +448,9 @@ int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur)
     tmp[0] = 0;
   }
 
-  if (!abort)
+  if (!aborted)
     be_barf_file (path, buf, buflen);
   be_free_memory (buf, buflen);
 
-  return (abort ? -1 : 0);
+  return (aborted ? -1 : 0);
 }