From: Thomas Roessler <roessler@does-not-exist.org>
Date: Mon, 26 Nov 2001 19:11:54 +0000 (+0000)
Subject: patch-1.3.23.2.bj.state_attach_puts.1, from Byrial Jensen.  This
X-Git-Tag: mutt-1-3-24-rel~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=449e85fe35152219381d7f6a647677659200bc8b;p=mutt

patch-1.3.23.2.bj.state_attach_puts.1, from Byrial Jensen.  This
patch is supposed to make one message more friendly to translators.
---

diff --git a/handler.c b/handler.c
index eb5da333..de24134e 100644
--- a/handler.c
+++ b/handler.c
@@ -1674,8 +1674,8 @@ static void external_body_handler (BODY *b, STATE *s)
       state_mark_attach (s);
       state_printf (s, _("[-- This %s/%s attachment is not included, --]\n"),
 		    TYPE(b->parts), b->parts->subtype);
-      state_attach_puts (_("[-- and the indicated external source has --]\n"), s);
-      state_attach_puts (_("[-- expired. --]\n"), s);
+      state_attach_puts (_("[-- and the indicated external source has --]\n"
+			   "[-- expired. --]\n"), s);
 
       mutt_copy_hdr(s->fpin, s->fpout, ftell (s->fpin), b->parts->offset,
 		    (option (OPTWEED) ? (CH_WEED | CH_REORDER) : 0) |
diff --git a/muttlib.c b/muttlib.c
index 0cb38656..53d696c3 100644
--- a/muttlib.c
+++ b/muttlib.c
@@ -1224,7 +1224,12 @@ void state_mark_attach (STATE *s)
 void state_attach_puts (const char *t, STATE *s)
 {
   state_mark_attach (s);
-  state_puts (t, s);
+  while (*t)
+  {
+    state_putc (*t, s);
+    if (*t++ == '\n' && *t)
+      state_mark_attach (s);
+  }
 }
 
 void mutt_display_sanitize (char *s)