Replace deprecated luaL_openlib() by luaL_register()

[apps/madmutt.git] / compose.c

diff --git a/compose.c b/compose.c
index 02d4aae..5e47cbe 100644 (file)
--- 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>
 
@@ -245,7 +244,7 @@ static int delete_attachment (MUTTMENU * menu, short *idxlen, int x)
     idx[x] = idx[x + 1];
   menu->max = --(*idxlen);
 
-  return (0);
+  return 0;
 }
 
 static void update_idx (MUTTMENU * menu, ATTACHPTR ** idx, short idxlen)
@@ -344,12 +343,12 @@ 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:
     *buf = 0;
-    return (src);
+    return src;
 
   default:
     *buf = 0;
@@ -359,7 +358,7 @@ static const char *compose_format_str (char *buf, ssize_t buflen, char op,
   if (flags & M_FORMAT_OPTIONAL)
     compose_status_line(buf, buflen, menu, optional ? ifstr : elstr);
 
-  return (src);
+  return src;
 }
 
 static void compose_status_line (char *buf, ssize_t buflen, MUTTMENU * menu,
@@ -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;
     }
@@ -1069,5 +1066,5 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
 
   p_delete(&idx);
 
-  return (r);
+  return r;
 }