more documentation.

[apps/madmutt.git] / compose.c

diff --git a/compose.c b/compose.c
index 6e68f53..ec7ac1b 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -201,7 +201,7 @@ static int check_attachments (ATTACHPTR ** idx, short idxlen)
 {
   int i, r;
   struct stat st;
-  char pretty[_POSIX_PATH_MAX], msg[_POSIX_PATH_MAX + SHORT_STRING];
+  char pretty[_POSIX_PATH_MAX], msg[_POSIX_PATH_MAX + STRING];
 
   for (i = 0; i < idxlen; i++) {
     m_strcpy(pretty, sizeof(pretty), idx[i]->content->filename);
@@ -231,7 +231,7 @@ static void draw_envelope_addr (int line, address_t * addr)
   char buf[STRING];
 
   buf[0] = 0;
-  rfc822_write_address (buf, sizeof (buf), addr, 1);
+  rfc822_addrcat(buf, sizeof (buf), addr, 1);
   mvprintw (line, SW, TITLE_FMT, Prompts[line - 1]);
   mutt_paddstr (W, buf);
 }
@@ -281,7 +281,7 @@ static int edit_address_list (int line, address_t ** addr)
   char *err = NULL;
 
   mutt_addrlist_to_local (*addr);
-  rfc822_write_address (buf, sizeof (buf), *addr, 0);
+  rfc822_addrcat(buf, sizeof (buf), *addr, 0);
   if (mutt_get_field (Prompts[line - 1], buf, sizeof (buf), M_ALIAS) == 0) {
     address_list_wipe(addr);
     *addr = mutt_parse_adrlist (*addr, buf);
@@ -301,7 +301,7 @@ static int edit_address_list (int line, address_t ** addr)
 
   /* redraw the expanded list so the user can see the result */
   buf[0] = 0;
-  rfc822_write_address (buf, sizeof (buf), *addr, 1);
+  rfc822_addrcat(buf, sizeof (buf), *addr, 1);
   move (line, HDR_XOFFSET + SW);
   mutt_paddstr (W, buf);
 
@@ -414,7 +414,7 @@ static const char *compose_format_str (char *buf, ssize_t buflen, char op,
                                        const char *elsestring,
                                        unsigned long data, format_flag flags)
 {
-  char fmt[SHORT_STRING], tmp[SHORT_STRING];
+  char fmt[STRING], tmp[STRING];
   int optional = (flags & M_FORMAT_OPTIONAL);
   MUTTMENU *menu = (MUTTMENU *) data;
 
@@ -476,7 +476,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
                        ssize_t fcclen,
                        HEADER * cur __attribute__ ((unused)))
 {                               /* current message */
-  char helpstr[SHORT_STRING];
+  char helpstr[STRING];
   char buf[LONG_STRING];
   char fname[_POSIX_PATH_MAX];
   MUTTMENU *menu;