X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compose.c;h=22af265aafb7863695f598dcd2a0d958d64abaf5;hp=ec7ac1b942fe0283fe597ebb5c7e802b49622892;hb=a6352753715bbffc5c11af249756af7cbb135856;hpb=688ac22f746f785c27ac99ac86aa85a3035a3638

diff --git a/compose.c b/compose.c
index ec7ac1b..22af265 100644
--- a/compose.c
+++ b/compose.c
@@ -113,10 +113,9 @@ static struct mapping_t ComposeNewsHelp[] = {
 
 
 static void snd_entry (char *b, ssize_t blen, MUTTMENU * menu, int num) {
-  int w=(COLS-SW)>blen?blen:COLS-SW;
-  mutt_FormatString (b, w, NONULL (AttachFormat), mutt_attach_fmt,
-                     (unsigned long) (((ATTACHPTR **) menu->data)[num]),
-                     M_FORMAT_STAT_FILE | M_FORMAT_ARROWCURSOR);
+  m_strformat(b, blen, COLS - SW, AttachFormat, mutt_attach_fmt,
+              ((ATTACHPTR **)menu->data)[num],
+              M_FORMAT_STAT_FILE | (option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0));
 }
 
 static void redraw_crypt_lines (HEADER * msg)
@@ -410,13 +409,13 @@ static void compose_status_line (char *buf, ssize_t buflen, MUTTMENU * menu,
 
 static const char *compose_format_str (char *buf, ssize_t buflen, char op,
                                        const char *src, const char *prefix,
-                                       const char *ifstring,
-                                       const char *elsestring,
-                                       unsigned long data, format_flag flags)
+                                       const char *ifstr,
+                                       const char *elstr,
+                                       anytype data, format_flag flags)
 {
   char fmt[STRING], tmp[STRING];
   int optional = (flags & M_FORMAT_OPTIONAL);
-  MUTTMENU *menu = (MUTTMENU *) data;
+  MUTTMENU *menu = data.ptr;
 
   *buf = 0;
   switch (op) {
@@ -427,7 +426,7 @@ static const char *compose_format_str (char *buf, ssize_t buflen, char op,
 
   case 'h':                    /* hostname */
     snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
-    snprintf (buf, buflen, fmt, NONULL (Hostname));
+    snprintf (buf, buflen, fmt, NONULL(MCore.shorthost));
     break;
 
   case 'l':                    /* approx length of current message in bytes */
@@ -437,7 +436,7 @@ static const char *compose_format_str (char *buf, ssize_t buflen, char op,
     break;
 
   case 'v':
-    m_strcpy(buf, buflen, mutt_make_version (0));
+    m_strcpy(buf, buflen, mutt_make_version());
     break;
 
   case 0:
@@ -445,14 +444,12 @@ static const char *compose_format_str (char *buf, ssize_t buflen, char op,
     return (src);
 
   default:
-    snprintf (buf, buflen, "%%%s%c", prefix, op);
+    *buf = 0;
     break;
   }
 
-  if (optional)
-    compose_status_line (buf, buflen, menu, ifstring);
-  else if (flags & M_FORMAT_OPTIONAL)
-    compose_status_line (buf, buflen, menu, elsestring);
+  if (flags & M_FORMAT_OPTIONAL)
+    compose_status_line(buf, buflen, menu, optional ? ifstr : elstr);
 
   return (src);
 }
@@ -460,9 +457,7 @@ static const char *compose_format_str (char *buf, ssize_t buflen, char op,
 static void compose_status_line (char *buf, ssize_t buflen, MUTTMENU * menu,
                                  const char *p)
 {
-  int w=(COLS-SW)>buflen?buflen:(COLS-SW);
-  mutt_FormatString (buf, w, p, compose_format_str,
-                     (unsigned long) menu, 0);
+    m_strformat(buf, buflen, COLS - SW, p, compose_format_str, menu, 0);
 }
 
 /* return values:
@@ -652,8 +647,8 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
       mutt_message_hook (NULL, msg, M_SEND2HOOK);
       break;
     case OP_COMPOSE_EDIT_MESSAGE:
-      if (Editor && !option (OPTEDITHDRS)) {
-        mutt_edit_file (Editor, msg->content->filename);
+      if (!option (OPTEDITHDRS)) {
+        mutt_edit_file(msg->content->filename);
         mutt_update_encoding (msg->content);
         menu->redraw = REDRAW_CURRENT | REDRAW_STATUS;
         mutt_message_hook (NULL, msg, M_SEND2HOOK);
@@ -667,8 +662,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
         char *err = NULL;
 
         mutt_env_to_local (msg->env);
-        mutt_edit_headers (NONULL (Editor), msg->content->filename, msg,
-                           fcc, fcclen);
+        mutt_edit_headers(msg->content->filename, msg, fcc, fcclen);
         if (mutt_env_to_idna (msg->env, &tag, &err)) {
           mutt_error (_("Bad IDN in \"%s\": '%s'"), tag, err);
           p_delete(&err);
@@ -1028,7 +1022,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
 
     case OP_COMPOSE_EDIT_FILE:
       CHECK_COUNT;
-      mutt_edit_file (NONULL (Editor), idx[menu->current]->content->filename);
+      mutt_edit_file(idx[menu->current]->content->filename);
       mutt_update_encoding (idx[menu->current]->content);
       menu->redraw = REDRAW_CURRENT | REDRAW_STATUS;
       mutt_message_hook (NULL, msg, M_SEND2HOOK);
@@ -1236,20 +1230,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
       r = 1;
       break;
 
-    case OP_COMPOSE_ISPELL:
-      endwin ();
-      snprintf (buf, sizeof (buf), "%s -x %s", NONULL (Ispell),
-                msg->content->filename);
-      if (mutt_system (buf) == -1)
-        mutt_error (_("Error running \"%s\"!"), buf);
-      else {
-        mutt_update_encoding (msg->content);
-        menu->redraw |= REDRAW_STATUS;
-      }
-      break;
-
     case OP_COMPOSE_WRITE_MESSAGE:
-
       fname[0] = '\0';
       if (Context) {
         m_strcpy(fname, sizeof(fname), NONULL(Context->path));
@@ -1287,10 +1268,6 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
       mutt_message_hook (NULL, msg, M_SEND2HOOK);
       break;
 
-    case OP_FORGET_PASSPHRASE:
-      crypt_forget_passphrase ();
-      break;
-
     case OP_COMPOSE_SMIME_MENU:
       if (msg->security & APPLICATION_PGP) {
         if (mutt_yesorno (_("PGP already selected. Clear & continue ? "),