[continued from previous message]

/* Returns -1 on failure otherwise same mask than mime_classify_media() */
S_(mime_run_selector multipart_selector)
+ static int multipart_selector P_((mime_t *p,
+ struct header_rec * hdr));
static int multipart_selector(p,hdr)
mime_t *p;
struct header_rec * hdr;
***************
*** 955,969 ****
}

goto done;
! } else
flags |= NOTPLAIN_need_metamail;
!

done:

DPRINT(Debug,11,(&Debug,
! "multipart_selector(%p) = %d\n",
! p,flags));

return flags;
}
--- 1352,1373 ----
}

goto done;
! } else {
! DPRINT(Debug,11,(&Debug,
! "multipart_selector(%p) -- type: %p=%s/%s -- need metamail\n",
! p,
! p->TYPE,
! get_major_type_name(p->TYPE),
! get_subtype_name(p->TYPE)));
!
flags |= NOTPLAIN_need_metamail;
! }

done:

DPRINT(Debug,11,(&Debug,
! "multipart_selector(%p) = %d %s\n",
! p,flags,debug_f(flags)));

return flags;
}
***************
*** 1044,1057 ****
goto out;
}

! /* state_nlputs or state_printf is needed for EOLN_is_CRLF
! conversions */
! if (nattach > 1)
state_nlputs("\n", state_out);

! if (decode_opt->displaying) {
! char *Encoding = "???";
!
/* \n resets this */
set_out_state_line_mode(state_out,pg_BOLD,title_range,1 /* Newline */);

--- 1448,1465 ----
goto out;
}

! if (nattach > 1) {
! set_out_state_line_mode(state_out,0,NULL,0); /* Add newline if not beginning
!