X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compose.c;h=b6677d40507ac5c02f87bb280710bb993dd709f7;hp=02d4aae2ef2dfbf7ad3dea7464dad7ebcbbd1131;hb=90f0c4dfb0480b5ce043c54f001d53ba6efc531b;hpb=cfd5f411041c7ef44087b032751792fadc74586d

diff --git a/compose.c b/compose.c
index 02d4aae..b6677d4 100644
--- a/compose.c
+++ b/compose.c
@@ -17,7 +17,6 @@
 #include <lib-mime/mime.h>
 
 #include <lib-ui/lib-ui.h>
-#include <lib-ui/enter.h>
 #include <lib-ui/menu.h>
 #include <lib-mx/mx.h>
 
@@ -344,7 +343,7 @@ static const char *compose_format_str (char *buf, ssize_t buflen, char op,
     break;
 
   case 'v':
-    m_strcpy(buf, buflen, mutt_make_version());
+    m_strcpy(buf, buflen, madmutt_version);
     break;
 
   case 0:
@@ -846,7 +845,6 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
         int itype;
         FILE *fp;
 
-        CLEARLINE(main_w, LINES - 1);
         fname[0] = 0;
         if (mutt_get_field (_("New file: "), fname, sizeof (fname), M_FILE)
             != 0 || !fname[0])
@@ -1007,7 +1005,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
         if (msg->content->next)
           msg->content = mutt_make_multipart (msg->content);
 
-        if (mutt_write_fcc (NONULL (fname), msg, NULL, 1, NULL) < 0)
+        if (mutt_write_fcc (fname, msg, NULL, 1, NULL) < 0)
           msg->content = mutt_remove_multipart (msg->content);
         else
           mutt_message _("Message written.");
@@ -1048,8 +1046,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
       compose_status_line (buf, sizeof (buf), menu, NONULL (ComposeFormat));
       CLEARLINE(main_w, 0);
       SETCOLOR(main_w, MT_COLOR_STATUS);
-      wmove (main_w, 0, 0);
-      wprintw (main_w, "%-*.*s", getmaxx(main_w), getmaxx(main_w), buf);
+      mvwprintw (main_w, 0, 0, "%-*.*s", getmaxx(main_w), getmaxx(main_w), buf);
       SETCOLOR(main_w, MT_COLOR_NORMAL);
       menu->redraw &= ~REDRAW_STATUS;
     }