X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compose.c;h=d607021a733d09e8978e0bf87a8881c9798bc242;hp=e2c2a0895c537c7825541ec0f085d43d9412bfa4;hb=03c8a86d85fc313b6772a1cdfc07e635583f9ed0;hpb=9946738a6a1c27a5602a14d1afe2eea2389732b2

diff --git a/compose.c b/compose.c
index e2c2a08..d607021 100644
--- a/compose.c
+++ b/compose.c
@@ -33,7 +33,7 @@
 #include "remailer.h"
 
 #ifdef USE_NNTP
-#include <nntp/nntp.h>
+#include "nntp.h"
 #endif
 
 #define CHECK_COUNT \
@@ -114,8 +114,7 @@ static struct mapping_t ComposeNewsHelp[] = {
 
 static void snd_entry (char *b, ssize_t blen, MUTTMENU * menu, int num) {
   m_strformat(b, blen, COLS - SW, AttachFormat, mutt_attach_fmt,
-              ((ATTACHPTR **)menu->data)[num],
-              M_FORMAT_STAT_FILE | (option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0));
+              ((ATTACHPTR **)menu->data)[num], M_FORMAT_STAT_FILE);
 }
 
 static void redraw_crypt_lines (HEADER * msg)
@@ -250,10 +249,6 @@ static void draw_envelope (HEADER * msg, char *fcc)
     mutt_paddstr (W, NONULL (msg->env->newsgroups));
     mvprintw (HDR_CC, SW, TITLE_FMT, Prompts[HDR_FOLLOWUPTO - 1]);
     mutt_paddstr (W, NONULL (msg->env->followup_to));
-    if (option (OPTXCOMMENTTO)) {
-      mvprintw (HDR_BCC, 0, TITLE_FMT, Prompts[HDR_XCOMMENTTO - 1]);
-      mutt_paddstr (W, NONULL (msg->env->x_comment_to));
-    }
   }
 #endif
   mvprintw (HDR_SUBJECT, SW, TITLE_FMT, Prompts[HDR_SUBJECT - 1]);
@@ -599,22 +594,6 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
       }
       break;
 
-    case OP_COMPOSE_EDIT_X_COMMENT_TO:
-      if (news && option (OPTXCOMMENTTO)) {
-        buf[0] = 0;
-        if (msg->env->x_comment_to)
-          m_strcpy(buf, sizeof(buf), msg->env->x_comment_to);
-        if (mutt_get_field ("X-Comment-To: ", buf, sizeof (buf), 0) == 0
-            && buf[0]) {
-          p_delete(&msg->env->x_comment_to);
-          msg->env->x_comment_to = m_strdup(buf);
-          move (HDR_BCC, HDR_XOFFSET);
-          clrtoeol ();
-          if (msg->env->x_comment_to)
-            printw ("%-*.*s", W, W, msg->env->x_comment_to);
-        }
-      }
-      break;
 #endif
     case OP_COMPOSE_EDIT_SUBJECT:
       if (msg->env->subject)