X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=commands.c;h=aae6e61635640c7040b7dcae372d3273222b630e;hp=889ac8a38defed37ae2e4c03f99b5fb1eccf051b;hb=b07d69b15852a06183f7b2298436e18150c36958;hpb=9274cbe8e6410ddb95ddc667faa678a29da85420

diff --git a/commands.c b/commands.c
index 889ac8a..aae6e61 100644
--- a/commands.c
+++ b/commands.c
@@ -13,7 +13,7 @@
 #endif
 
 #include <lib-lib/mem.h>
-
+#include <lib-lib/file.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/ascii.h>
 
@@ -96,7 +96,7 @@ int mutt_display_message (HEADER * cur)
     }
   }
 
-  if (!Pager || str_cmp (Pager, "builtin") == 0)
+  if (!Pager || m_strcmp(Pager, "builtin") == 0)
     builtin = 1;
   else {
     mutt_make_string (buf, sizeof (buf), NONULL (PagerFmt), Context, cur);
@@ -288,13 +288,12 @@ void ci_bounce_message (HEADER * h, int *redraw)
             buf);
 
   if (mutt_strwidth (prompt) > COLS - extra_space) {
-    mutt_format_string (prompt, sizeof (prompt),
-                        0, COLS - extra_space, 0, 0,
-                        prompt, sizeof (prompt), 0);
-    str_cat (prompt, sizeof (prompt), "...?");
+    mutt_format_string(prompt, sizeof(prompt), 0, COLS - extra_space, 0, 0,
+                       prompt, sizeof(prompt), 0);
+    m_strcat(prompt, sizeof(prompt), "...?");
+  } else {
+    m_strcat(prompt, sizeof(prompt), "?");
   }
-  else
-    str_cat (prompt, sizeof (prompt), "?");
 
   if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
     rfc822_free_address (&adr);
@@ -750,7 +749,7 @@ int mutt_save_message (HEADER * h, int delete,
   /* This is an undocumented feature of ELM pointed out to me by Felix von
    * Leitner <leitner@prz.fu-berlin.de>
    */
-  if (str_cmp (buf, ".") == 0)
+  if (m_strcmp(buf, ".") == 0)
     strfcpy (buf, LastSaveFolder, sizeof (buf));
   else
     strfcpy (LastSaveFolder, buf, sizeof (LastSaveFolder));