Attachment #67374 for bug #104430

View | Details | Raw Unified | Return to bug 104430
Collapse All | Expand All

Lines 51-57 Link Here

(-)mutt-1.5.8-base/flags.c (-1 / +2 lines)
51		51
52	if (bf)	52	if (bf)
53	{	53	{
54	if (!h->deleted && !ctx->readonly)	54	if (!h->deleted && !ctx->readonly
		55	&& (!h->flagged \|\| !option(OPTFLAGSAFE)))
55	{	56	{
56	h->deleted = 1;	57	h->deleted = 1;
57	if (upd_ctx) ctx->deleted++;	58	if (upd_ctx) ctx->deleted++;

Lines 550-555 Link Here

(-)mutt-1.5.8-base/init.h (+5 lines)
550	** signed.	550	** signed.
551	** (PGP only)	551	** (PGP only)
552	*/	552	*/
		553	{ "flag_safe", DT_BOOL, R_NONE, OPTFLAGSAFE, 0 },
		554	/*
		555	** .pp
		556	** If set, flagged messages cannot be deleted.
		557	*/
553	{ "folder", DT_PATH, R_NONE, UL &Maildir, UL "~/Mail" },	558	{ "folder", DT_PATH, R_NONE, UL &Maildir, UL "~/Mail" },
554	/*	559	/*
555	** .pp	560	** .pp

Lines 533-540 Link Here

(-)mutt-1.5.8-base/mh.c (-2 / +5 lines)
533	break;	533	break;
534		534
535	case 'T': /* trashed */	535	case 'T': /* trashed */
536	h->trash = 1;	536	if (!h->flagged \|\| !option(OPTFLAGSAFE))
537	h->deleted = 1;	537	{
		538	h->trash = 1;
		539	h->deleted = 1;
		540	}
538	break;	541	break;
539		542
540	default:	543	default:

Return to bug 104430