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 eb5da333a90c2c724fbce71d88907216b3d1a152..de24134e502ecbb6efc2b34a2b26ef97b6fa39cc 100644 (file)
--- 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 0cb386563d28ab770eb0cdceef33cdc5aa44d1a5..53d696c3453508ca8b39221df84b7e331f30297c 100644 (file)
--- 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)