X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=commands.c;h=a7cc074e45bb23d820ab71b63e61d674807edaec;hp=6f9a0d35db1230c35d867fb32ec975095a797886;hb=488a60c8ef78872f38bbb3439a75cb2cda985a12;hpb=688ac22f746f785c27ac99ac86aa85a3035a3638

diff --git a/commands.c b/commands.c
index 6f9a0d3..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>
@@ -251,7 +252,7 @@ void ci_bounce_message (HEADER * h, int *redraw)
             (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);
@@ -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)