Rocco Rutte:

- merge in latest mutt changes

git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@406 e385b8ad-14ed-0310-8656-cc95a2468c6d

diff --git a/ChangeLog.mutt b/ChangeLog.mutt
index 4c22836..b96a691 100644 (file)
--- a/ChangeLog.mutt
+++ b/ChangeLog.mutt
@@ -1,3 +1,30 @@
+2005-08-16 18:10:11  Paul Walker  <paul@black-sun.demon.co.uk>  (brendan)
+
+       * doc/manual.sgml.head, doc/mutt.man, main.c: -D dumps to stdout,
+       not stderr.
+
+2005-08-15 08:10:48  Thomas Roessler  <roessler@does-not-exist.org>  (roessler)
+
+       * po/id.po: Fix \n mismatch.
+
+2005-08-15 08:07:36  Ronny Haryanto  <ronnylist@haryan.to>  (roessler)
+
+       * po/id.po: update
+
+2005-08-15 08:06:40  Vsevolod Volkov  <vvv@mutt.org.ua>  (roessler)
+
+       * po/ru.po: update
+
+2005-08-14 21:32:17  TAKAHASHI Tamotsu  <ttakah@lapis.plala.or.jp>  (brendan)
+
+       * attach.c, send.c: Don't pass an empty filename to the default
+       text editor when editing non-plain text. Also don't clobber
+       $content_type when parsing it. Closes: #2038.
+
+2005-08-14 12:28:52  Roland Rosenfeld  <roland@spinnaker.de>  (roessler)
+
+       * po/de.po: update
+

 2005-08-14 02:22:47  Bernd Ahlers  <bernd@ba-net.org>  (brendan)
 
        * cryptglue.c, mutt_sasl.c, smime.c: Fix some S/MIME spelling
 2005-08-14 02:22:47  Bernd Ahlers  <bernd@ba-net.org>  (brendan)
 
        * cryptglue.c, mutt_sasl.c, smime.c: Fix some S/MIME spelling

diff --git a/attach.c b/attach.c
index 4e985c1..c32eb79 100644 (file)
--- a/attach.c
+++ b/attach.c
@@ -248,7 +248,7 @@ int mutt_edit_attachment (BODY * a)
   }
   else if (a->type == TYPETEXT) {
     /* On text, default to editor */
   }
   else if (a->type == TYPETEXT) {
     /* On text, default to editor */

-    mutt_edit_file (NONULL (Editor), newfile);
+    mutt_edit_file (NONULL (Editor), a->filename);

   }
   else {
     rfc1524_free_entry (&entry);
   }
   else {
     rfc1524_free_entry (&entry);

diff --git a/send.c b/send.c
index 851db2d..3b17228 100644 (file)
--- a/send.c
+++ b/send.c
@@ -1095,6 +1095,7 @@ int ci_send_message (int flags, /* send mode */
   /* save current value of "pgp_sign_as" */
   char *signas = NULL;
   char *tag = NULL, *err = NULL;
   /* save current value of "pgp_sign_as" */
   char *signas = NULL;
   char *tag = NULL, *err = NULL;

+  char *ctype;

 
   int rv = -1;
 
 
   int rv = -1;
 


@@ -1175,7 +1176,10 @@ int ci_send_message (int flags, /* send mode */
     pbody->next = msg->content; /* don't kill command-line attachments */
     msg->content = pbody;
 
     pbody->next = msg->content; /* don't kill command-line attachments */
     msg->content = pbody;
 

-    mutt_parse_content_type (ContentType, msg->content);
+    ctype = str_dup (ContentType);
+    mutt_parse_content_type (ctype, msg->content);
+    mem_free (&ctype);
+

     msg->content->unlink = 1;
     msg->content->use_disp = 0;
     msg->content->disposition = DISPINLINE;
     msg->content->unlink = 1;
     msg->content->use_disp = 0;
     msg->content->disposition = DISPINLINE;