X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=commands.c;h=a7cc074e45bb23d820ab71b63e61d674807edaec;hp=4a40dc96973dbb7d8065dc0889cc10bc5af8a20c;hb=488a60c8ef78872f38bbb3439a75cb2cda985a12;hpb=928ca0d87eb15bfa4c150abdadadaf3b177f95bd

diff --git a/commands.c b/commands.c
index 4a40dc9..a7cc074 100644
--- a/commands.c
+++ b/commands.c
@@ -16,6 +16,7 @@
 #include <lib-sys/exit.h>
 #include <lib-sys/unix.h>
 
+#include <lib-lua/lib-lua.h>
 #include <lib-ui/curses.h>
 #include <lib-ui/enter.h>
 #include <lib-ui/menu.h>
@@ -207,7 +208,7 @@ int mutt_display_message (HEADER * cur)
 
 void ci_bounce_message (HEADER * h, int *redraw)
 {
-  char prompt[SHORT_STRING];
+  char prompt[STRING];
   char buf[HUGE_STRING] = { 0 };
   address_t *adr = NULL;
   char *err = NULL;
@@ -244,14 +245,14 @@ void ci_bounce_message (HEADER * h, int *redraw)
   }
 
   buf[0] = 0;
-  rfc822_write_address (buf, sizeof (buf), adr, 1);
+  rfc822_addrcat(buf, sizeof (buf), adr, 1);
 
 #define extra_space (15 + 7 + 2)
   snprintf (prompt, sizeof (prompt),
             (h ? _("Bounce message to %s") : _("Bounce messages to %s")),
             buf);
 
-  if (mutt_strwidth (prompt) > COLS - extra_space) {
+  if (m_strwidth(prompt) > COLS - extra_space) {
     mutt_format_string(prompt, sizeof(prompt), 0, COLS - extra_space, 0, 0,
                        prompt, sizeof(prompt), 0);
     m_strcat(prompt, sizeof(prompt), "...?");
@@ -518,8 +519,8 @@ void mutt_shell_escape (void)
 
   buf[0] = 0;
   if (mutt_get_field (_("Shell command: "), buf, sizeof (buf), M_CMD) == 0) {
-    if (!buf[0] && Shell)
-      m_strcpy(buf, sizeof(buf), Shell);
+    if (!buf[0])
+      m_strcpy(buf, sizeof(buf), mlua_reggets(LTK_SHELL));
     if (buf[0]) {
       CLEARLINE (LINES - 1);
       mutt_endwin (NULL);
@@ -534,7 +535,7 @@ void mutt_shell_escape (void)
 void mutt_enter_command (void)
 {
   BUFFER err, token;
-  char buffer[LONG_STRING], errbuf[SHORT_STRING];
+  char buffer[LONG_STRING], errbuf[STRING];
   int r;
 
   buffer[0] = 0;
@@ -560,7 +561,7 @@ void mutt_enter_command (void)
 void mutt_display_address (ENVELOPE * env)
 {
   const char *pfx = NULL;
-  char buf[SHORT_STRING];
+  char buf[STRING];
   address_t *adr = NULL;
 
   adr = mutt_get_address(env, &pfx);
@@ -576,7 +577,7 @@ void mutt_display_address (ENVELOPE * env)
    */
 
   buf[0] = 0;
-  rfc822_write_address (buf, sizeof (buf), adr, 0);
+  rfc822_addrcat(buf, sizeof (buf), adr, 0);
   mutt_message ("%s: %s", pfx, buf);
 }
 
@@ -641,7 +642,7 @@ int mutt_save_message (HEADER * h, int delete,
                        int decode, int decrypt, int *redraw) {
   int i, need_buffy_cleanup;
   int need_passphrase = 0, app = 0;
-  char prompt[SHORT_STRING], buf[_POSIX_PATH_MAX];
+  char prompt[STRING], buf[_POSIX_PATH_MAX];
   CONTEXT ctx;
   struct stat st;
   struct utimbuf ut;
@@ -777,7 +778,7 @@ int mutt_save_message (HEADER * h, int delete,
 
 void mutt_version (void)
 {
-  mutt_message (mutt_make_version (1));
+  mutt_message (mutt_make_version());
 }
 
 void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
@@ -853,12 +854,12 @@ void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
 
   if (!is_multipart(b) && b->parts)
     body_list_wipe(&b->parts);
-  if (!mutt_is_message_type (b->type, b->subtype) && b->hdr) {
+  if (!mutt_is_message_type(b) && b->hdr) {
     b->hdr->content = NULL;
     header_delete(&b->hdr);
   }
 
-  if (fp && (is_multipart(b) || mutt_is_message_type(b->type, b->subtype)))
+  if (fp && (is_multipart(b) || mutt_is_message_type(b)))
     mutt_parse_part (fp, b);
 
   if (h) {