X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=attach.c;h=d42e47a2f66418730c5caac46ce3929d0c500e1e;hp=1dbc76ed709768b06b571ab0eaf77694d900de29;hb=c9f72ab0cd65f517a2047feb942ad85025c1b7e8;hpb=3b7a8f7577e7b40d39ba510f54bde0d3ec0cc58f

diff --git a/attach.c b/attach.c
index 1dbc76e..d42e47a 100644
--- a/attach.c
+++ b/attach.c
@@ -138,7 +138,7 @@ int mutt_compose_attachment (BODY * a)
             /* Remove headers by copying out data to another file, then 
              * copying the file back */
             fseeko (fp, b->offset, 0);
-            tfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+            tfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL);
             if (!tfp) {
               mutt_perror (_("Failure to open file to strip headers."));
               goto bailout;
@@ -228,7 +228,7 @@ int mutt_edit_attachment (BODY * a)
   }
   else if (a->type == TYPETEXT) {
     /* On text, default to editor */
-    mutt_edit_file (NONULL (Editor), a->filename);
+    mutt_edit_file(a->filename);
   } else {
     rfc1524_entry_delete(&entry);
     mutt_error (_("No mailcap edit entry for %s"), type);
@@ -440,7 +440,7 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
 
   if (use_pager) {
     /* recv case */
-    pagerfd = m_tempfd(pagerfile, sizeof(pagerfile), NONULL(Tempdir),
+    pagerfd = m_tempfd(pagerfile, sizeof(pagerfile), NONULL(MCore.tmpdir),
                        fp && !use_mailcap ? a->filename : NULL);
   }
 
@@ -923,7 +923,7 @@ int mutt_print_attachment (FILE * fp, BODY * a)
     ifp = NULL;
     fpout = NULL;
 
-    newfile_fd = m_tempfd(newfile, sizeof(newfile), NONULL(Tempdir), NULL);
+    newfile_fd = m_tempfd(newfile, sizeof(newfile), NONULL(MCore.tmpdir), NULL);
     if (mutt_decode_save_attachment (fp, a, newfile_fd, M_PRINTING) == 0) {
 
       if ((ifp = fopen(newfile, "r")) == NULL) {