From 17a0e20c69f875f98afb440c6f20c1ab5406d4c9 Mon Sep 17 00:00:00 2001 From: Antonio Radici Date: Sun, 24 May 2009 16:23:47 +0100 Subject: [PATCH] refreshed a bunch of patches against 1.5.19 --- .../Md.etc_mailname_gethostbyname.diff | 6 +- .../debian-specific/assumed_charset-compat | 12 ++- .../correct_docdir_in_man_page.diff | 2 +- .../patch-1.5.4.vk.pgp_verbose_mime | 32 +++---- debian/patches/features/ifdef | 28 +++--- debian/patches/features/maildir-mtime | 31 +++---- debian/patches/features/purge-message | 85 ++++++++----------- debian/patches/features/trash-folder | 34 ++++---- debian/patches/features/xtitles | 26 +++--- .../mutt-patched/sidebar-compat-revert.debian | 6 +- 10 files changed, 122 insertions(+), 140 deletions(-) diff --git a/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.diff b/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.diff index f7a94b0..6220c0f 100644 --- a/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.diff +++ b/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.diff @@ -1,6 +1,6 @@ --- a/init.c +++ b/init.c -@@ -46,6 +46,7 @@ +@@ -47,6 +47,7 @@ #include #include #include @@ -8,7 +8,7 @@ #include #include -@@ -2911,6 +2912,31 @@ static int mutt_execute_commands (LIST * +@@ -2952,6 +2953,31 @@ return 0; } @@ -40,7 +40,7 @@ void mutt_init (int skip_sys_rc, LIST *commands) { struct passwd *pw; -@@ -2982,10 +3008,25 @@ void mutt_init (int skip_sys_rc, LIST *c +@@ -3026,10 +3052,25 @@ Hostname = mutt_substrdup (utsname.nodename, p); p++; strfcpy (buffer, p, sizeof (buffer)); /* save the domain for below */ diff --git a/debian/patches/debian-specific/assumed_charset-compat b/debian/patches/debian-specific/assumed_charset-compat index 3a6c763..ce965d9 100644 --- a/debian/patches/debian-specific/assumed_charset-compat +++ b/debian/patches/debian-specific/assumed_charset-compat @@ -1,13 +1,11 @@ On upstream inclusion of the assumed_charset patch (past 1.5.14), file_charset got renamed to attach_charset. We add it back for compatibility. -Index: mutt/init.h -=================================================================== ---- mutt.orig/init.h 2007-03-12 19:11:53.000000000 +0100 -+++ mutt/init.h 2007-03-12 19:13:56.000000000 +0100 -@@ -248,6 +248,9 @@ struct option_t MuttVars[] = { - ** Note: "iso-2022-*" must be put at the head of the value as shown above - ** if included. +--- a/init.h ++++ b/init.h +@@ -208,6 +208,9 @@ + ** Note: for Japanese users, ``iso-2022-*'' must be put at the head + ** of the value as shown above if included. */ + { "file_charset", DT_SYN, R_NONE, UL "attach_charset", 0 }, + /* diff --git a/debian/patches/debian-specific/correct_docdir_in_man_page.diff b/debian/patches/debian-specific/correct_docdir_in_man_page.diff index dcfdd4f..a6e5f16 100644 --- a/debian/patches/debian-specific/correct_docdir_in_man_page.diff +++ b/debian/patches/debian-specific/correct_docdir_in_man_page.diff @@ -1,6 +1,6 @@ --- a/doc/mutt.man +++ b/doc/mutt.man -@@ -167,7 +167,7 @@ User's personal mapping between MIME typ +@@ -185,7 +185,7 @@ System mapping between MIME types and file extensions. .IP "@bindir@/mutt_dotlock" The privileged dotlocking program. diff --git a/debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime b/debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime index 0ea9b73..499b73d 100644 --- a/debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime +++ b/debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime @@ -1,7 +1,6 @@ -diff -ruN mutt.orig/globals.h mutt/globals.h ---- mutt.orig/globals.h 2003-09-13 16:23:24.000000000 +0200 -+++ mutt/globals.h 2003-09-13 16:23:18.000000000 +0200 -@@ -195,6 +195,8 @@ +--- a/globals.h ++++ b/globals.h +@@ -241,6 +241,8 @@ WHERE char *PgpListSecringCommand; WHERE char *PgpListPubringCommand; WHERE char *PgpGetkeysCommand; @@ -10,12 +9,11 @@ diff -ruN mutt.orig/globals.h mutt/globals.h /*-- formerly in smime.h --*/ WHERE char *SmimeDefaultKey; -diff -ruN mutt.orig/init.h mutt/init.h ---- mutt.orig/init.h 2003-09-13 16:23:24.000000000 +0200 -+++ mutt/init.h 2003-09-13 16:21:53.000000000 +0200 -@@ -1458,6 +1458,18 @@ - ** This option overrides ``$$pgp_create_traditional'' - ** (PGP only) +--- a/init.h ++++ b/init.h +@@ -1790,6 +1790,18 @@ + ** checked with the \fC$\fP function, mutt will automatically + ** check the message for traditional pgp. */ + { "pgp_mime_signature_filename", DT_STR, R_NONE, UL &PgpMimeSignatureFilename, UL "signature.asc"}, + /* @@ -31,11 +29,10 @@ diff -ruN mutt.orig/init.h mutt/init.h + */ /* XXX Default values! */ - -diff -ruN mutt.orig/pgp.c mutt/pgp.c ---- mutt.orig/pgp.c 2003-09-13 16:23:24.000000000 +0200 -+++ mutt/pgp.c 2003-09-13 16:21:53.000000000 +0200 -@@ -998,6 +998,8 @@ + +--- a/pgp.c ++++ b/pgp.c +@@ -1113,6 +1113,8 @@ t->disposition = DISPINLINE; t->encoding = ENC7BIT; t->unlink = 1; /* ok to remove this file after sending. */ @@ -46,5 +43,8 @@ diff -ruN mutt.orig/pgp.c mutt/pgp.c } --- a/PATCHES +++ b/PATCHES -@@ -0,0 +1 @@ +@@ -1,3 +1,4 @@ +patch-1.5.4.vk.pgp_verbose_mime + patch-1.5.13.cd.purge_message.3.4 + patch-1.5.13.nt+ab.xtitles.4 + patch-1.5.6.dw.maildir-mtime.1 diff --git a/debian/patches/features/ifdef b/debian/patches/features/ifdef index 661bb2f..1463d4b 100644 --- a/debian/patches/features/ifdef +++ b/debian/patches/features/ifdef @@ -26,11 +26,9 @@ ifdef trash set trash=~/Mail/trash - Use mutt_strcmp in favor of ascii_strncasecmp to compare strings. == END PATCH -Index: mutt/init.c -=================================================================== ---- mutt.orig/init.c 2006-12-12 14:15:03.000000000 +0100 -+++ mutt/init.c 2007-02-15 23:38:45.597907432 +0100 -@@ -624,6 +624,65 @@ static int remove_from_rx_list (RX_LIST +--- a/init.c ++++ b/init.c +@@ -635,6 +635,65 @@ return (rv); } @@ -96,11 +94,9 @@ Index: mutt/init.c static int parse_unignore (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err) { do -Index: mutt/init.h -=================================================================== ---- mutt.orig/init.h 2006-12-12 14:15:03.000000000 +0100 -+++ mutt/init.h 2007-02-15 23:26:21.160079184 +0100 -@@ -3017,6 +3017,7 @@ static int parse_lists (BUFFER *, BUFFER +--- a/init.h ++++ b/init.h +@@ -3351,6 +3351,7 @@ static int parse_unlists (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_alias (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_unalias (BUFFER *, BUFFER *, unsigned long, BUFFER *); @@ -108,7 +104,7 @@ Index: mutt/init.h static int parse_ignore (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_unignore (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_source (BUFFER *, BUFFER *, unsigned long, BUFFER *); -@@ -3068,6 +3069,7 @@ struct command_t Commands[] = { +@@ -3401,6 +3402,7 @@ { "group", parse_group, 0 }, { "ungroup", parse_ungroup, 0 }, { "hdr_order", parse_list, UL &HeaderOrderList }, @@ -116,11 +112,9 @@ Index: mutt/init.h #ifdef HAVE_ICONV { "iconv-hook", mutt_parse_hook, M_ICONVHOOK }, #endif -Index: mutt/doc/manual.xml.head -=================================================================== ---- mutt.orig/doc/manual.xml.head 2007-02-15 21:53:09.312169280 +0100 -+++ mutt/doc/manual.xml.head 2007-02-15 23:42:23.875724160 +0100 -@@ -3091,6 +3091,28 @@ considered to be an executable program f +--- a/doc/manual.xml.head ++++ b/doc/manual.xml.head +@@ -3816,6 +3816,28 @@ @@ -149,7 +143,7 @@ Index: mutt/doc/manual.xml.head Removing hooks ---- a/PATCHES +--- /dev/null +++ b/PATCHES @@ -0,0 +1 @@ +patch-1.5.13.cd.ifdef.2 diff --git a/debian/patches/features/maildir-mtime b/debian/patches/features/maildir-mtime index 92c2909..4822888 100644 --- a/debian/patches/features/maildir-mtime +++ b/debian/patches/features/maildir-mtime @@ -18,7 +18,7 @@ The home page for this patch is: == END PATCH --- a/buffy.c +++ b/buffy.c -@@ -226,6 +226,7 @@ int mutt_parse_mailboxes (BUFFER *path, +@@ -226,6 +226,7 @@ (*tmp)->new = 0; (*tmp)->notified = 1; (*tmp)->newly_created = 0; @@ -26,7 +26,7 @@ The home page for this patch is: /* for check_mbox_size, it is important that if the folder is new (tested by * reading it), the size is set to 0 so that later when we check we see -@@ -254,6 +255,7 @@ int mutt_buffy_check (int force) +@@ -254,6 +255,7 @@ { BUFFY *tmp; struct stat sb; @@ -34,7 +34,7 @@ The home page for this patch is: struct dirent *de; DIR *dirp; char path[_POSIX_PATH_MAX]; -@@ -298,6 +300,7 @@ int mutt_buffy_check (int force) +@@ -298,6 +300,7 @@ if (tmp->magic != M_IMAP) #endif tmp->new = 0; @@ -42,7 +42,7 @@ The home page for this patch is: #ifdef USE_IMAP if (tmp->magic != M_IMAP) -@@ -380,10 +383,20 @@ int mutt_buffy_check (int force) +@@ -380,10 +383,20 @@ if (*de->d_name != '.' && (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T'))) { @@ -69,7 +69,7 @@ The home page for this patch is: closedir (dirp); --- a/init.h +++ b/init.h -@@ -1086,6 +1086,16 @@ struct option_t MuttVars[] = { +@@ -1185,6 +1185,16 @@ ** \fBDON'T CHANGE THIS SETTING UNLESS YOU ARE REALLY SURE WHAT YOU ARE ** DOING!\fP */ @@ -88,7 +88,7 @@ The home page for this patch is: /* --- a/mutt.h +++ b/mutt.h -@@ -395,6 +395,7 @@ enum +@@ -375,6 +375,7 @@ OPTINCLUDEONLYFIRST, OPTKEEPFLAGGED, OPTMAILCAPSANITIZE, @@ -106,7 +106,7 @@ The home page for this patch is: #include #include -@@ -307,8 +308,10 @@ folder_format_str (char *dest, size_t de +@@ -308,8 +309,10 @@ } static void add_folder (MUTTMENU *m, struct browser_state *state, @@ -118,7 +118,7 @@ The home page for this patch is: if (state->entrylen == state->entrymax) { /* need to allocate more space */ -@@ -320,6 +323,9 @@ static void add_folder (MUTTMENU *m, str +@@ -321,6 +324,9 @@ m->data = state->entry; } @@ -128,7 +128,7 @@ The home page for this patch is: if (s != NULL) { (state->entry)[state->entrylen].mode = s->st_mode; -@@ -414,7 +420,7 @@ static int examine_directory (MUTTMENU * +@@ -415,7 +421,7 @@ tmp = Incoming; while (tmp && mutt_strcmp (buffer, tmp->path)) tmp = tmp->next; @@ -137,7 +137,7 @@ The home page for this patch is: } closedir (dp); browser_sort (state); -@@ -438,14 +444,15 @@ static int examine_mailboxes (MUTTMENU * +@@ -443,14 +449,15 @@ if (mx_is_imap (tmp->path)) { imap_mailbox_state (tmp->path, &mbox); @@ -155,9 +155,9 @@ The home page for this patch is: continue; } #endif -@@ -459,7 +466,7 @@ static int examine_mailboxes (MUTTMENU * +@@ -464,7 +471,7 @@ strfcpy (buffer, NONULL(tmp->path), sizeof (buffer)); - mutt_pretty_mailbox (buffer); + mutt_pretty_mailbox (buffer, sizeof (buffer)); - add_folder (menu, state, buffer, &s, tmp->new); + add_folder (menu, state, buffer, &s, tmp); @@ -166,9 +166,9 @@ The home page for this patch is: browser_sort (state); --- a/buffy.h +++ b/buffy.h -@@ -25,6 +25,7 @@ typedef struct buffy_t +@@ -25,6 +25,7 @@ char *path; - long size; + off_t size; struct buffy_t *next; + time_t mtime; /* for maildirs...time of newest entry */ short new; /* mailbox has new mail */ @@ -176,5 +176,6 @@ The home page for this patch is: short magic; /* mailbox type */ --- a/PATCHES +++ b/PATCHES -@@ -0,0 +1 @@ +@@ -1 +1,2 @@ +patch-1.5.6.dw.maildir-mtime.1 + patch-1.5.13.cd.ifdef.2 diff --git a/debian/patches/features/purge-message b/debian/patches/features/purge-message index 69851f2..125c8fc 100644 --- a/debian/patches/features/purge-message +++ b/debian/patches/features/purge-message @@ -26,11 +26,9 @@ of having a trash folder feature. - Fixed indentation of "purged" in mutt.h. == END PATCH -Index: trash/OPS -=================================================================== ---- trash.orig/OPS 2006-12-12 14:15:02.000000000 +0100 -+++ trash/OPS 2007-02-15 19:39:57.479112576 +0100 -@@ -140,6 +140,7 @@ OP_PREV_ENTRY "move to the previous entr +--- a/OPS ++++ b/OPS +@@ -141,6 +141,7 @@ OP_PREV_LINE "scroll up one line" OP_PREV_PAGE "move to the previous page" OP_PRINT "print the current entry" @@ -38,11 +36,9 @@ Index: trash/OPS OP_QUERY "query external program for addresses" OP_QUERY_APPEND "append new query results to current results" OP_QUIT "save changes to mailbox and quit" -Index: trash/curs_main.c -=================================================================== ---- trash.orig/curs_main.c 2006-12-12 14:15:02.000000000 +0100 -+++ trash/curs_main.c 2007-02-15 19:39:57.480112424 +0100 -@@ -1778,6 +1778,7 @@ int mutt_index_menu (void) +--- a/curs_main.c ++++ b/curs_main.c +@@ -1816,6 +1816,7 @@ MAYBE_REDRAW (menu->redraw); break; @@ -50,7 +46,7 @@ Index: trash/curs_main.c case OP_DELETE: CHECK_MSGCOUNT; -@@ -1788,6 +1789,7 @@ int mutt_index_menu (void) +@@ -1826,6 +1827,7 @@ if (tag) { mutt_tag_set_flag (M_DELETE, 1); @@ -58,7 +54,7 @@ Index: trash/curs_main.c if (option (OPTDELETEUNTAG)) mutt_tag_set_flag (M_TAG, 0); menu->redraw = REDRAW_INDEX; -@@ -1795,6 +1797,8 @@ int mutt_index_menu (void) +@@ -1833,6 +1835,8 @@ else { mutt_set_flag (Context, CURHDR, M_DELETE, 1); @@ -67,7 +63,7 @@ Index: trash/curs_main.c if (option (OPTDELETEUNTAG)) mutt_set_flag (Context, CURHDR, M_TAG, 0); if (option (OPTRESOLVE)) -@@ -2088,11 +2092,13 @@ int mutt_index_menu (void) +@@ -2129,11 +2133,13 @@ if (tag) { mutt_tag_set_flag (M_DELETE, 0); @@ -81,7 +77,7 @@ Index: trash/curs_main.c if (option (OPTRESOLVE) && menu->current < Context->vcount - 1) { menu->current++; -@@ -2113,9 +2119,11 @@ int mutt_index_menu (void) +@@ -2154,9 +2160,11 @@ CHECK_ACL(M_ACL_DELETE, _("undelete message(s)")); rc = mutt_thread_set_flag (CURHDR, M_DELETE, 0, @@ -95,11 +91,9 @@ Index: trash/curs_main.c { if (option (OPTRESOLVE)) { -Index: trash/flags.c -=================================================================== ---- trash.orig/flags.c 2007-02-15 19:38:00.433906152 +0100 -+++ trash/flags.c 2007-02-15 19:39:57.480112424 +0100 -@@ -105,6 +105,16 @@ void _mutt_set_flag (CONTEXT *ctx, HEADE +--- a/flags.c ++++ b/flags.c +@@ -104,6 +104,16 @@ } break; @@ -116,11 +110,9 @@ Index: trash/flags.c case M_NEW: if (!mutt_bit_isset(ctx->rights,M_ACL_SEEN)) -Index: trash/functions.h -=================================================================== ---- trash.orig/functions.h 2005-09-18 13:16:40.000000000 +0200 -+++ trash/functions.h 2007-02-15 19:39:57.481112272 +0100 -@@ -103,6 +103,7 @@ struct binding_t OpMain[] = { +--- a/functions.h ++++ b/functions.h +@@ -120,6 +120,7 @@ { "toggle-write", OP_TOGGLE_WRITE, "%" }, { "next-thread", OP_MAIN_NEXT_THREAD, "\016" }, { "next-subthread", OP_MAIN_NEXT_SUBTHREAD, "\033n" }, @@ -128,7 +120,7 @@ Index: trash/functions.h { "query", OP_QUERY, "Q" }, { "quit", OP_QUIT, "q" }, { "reply", OP_REPLY, "r" }, -@@ -189,6 +190,7 @@ struct binding_t OpPager[] = { +@@ -207,6 +208,7 @@ { "print-message", OP_PRINT, "p" }, { "previous-thread", OP_MAIN_PREV_THREAD, "\020" }, { "previous-subthread",OP_MAIN_PREV_SUBTHREAD, "\033p" }, @@ -136,11 +128,9 @@ Index: trash/functions.h { "quit", OP_QUIT, "Q" }, { "exit", OP_EXIT, "q" }, { "reply", OP_REPLY, "r" }, -Index: trash/mutt.h -=================================================================== ---- trash.orig/mutt.h 2007-02-15 19:38:00.435905848 +0100 -+++ trash/mutt.h 2007-02-15 19:40:38.768835584 +0100 -@@ -201,6 +201,7 @@ enum +--- a/mutt.h ++++ b/mutt.h +@@ -182,6 +182,7 @@ M_UNDELETE, M_DELETED, M_APPENDED, @@ -148,7 +138,7 @@ Index: trash/mutt.h M_FLAG, M_TAG, M_UNTAG, -@@ -705,6 +706,7 @@ typedef struct header +@@ -695,6 +696,7 @@ unsigned int flagged : 1; /* marked important? */ unsigned int tagged : 1; unsigned int appended : 1; /* has been saved */ @@ -156,11 +146,9 @@ Index: trash/mutt.h unsigned int deleted : 1; unsigned int changed : 1; unsigned int attach_del : 1; /* has an attachment marked for deletion */ -Index: trash/mx.c -=================================================================== ---- trash.orig/mx.c 2007-02-15 19:38:00.436905696 +0100 -+++ trash/mx.c 2007-02-15 19:39:57.482112120 +0100 -@@ -852,6 +852,7 @@ static int trash_append (CONTEXT *ctx) +--- a/mx.c ++++ b/mx.c +@@ -833,6 +833,7 @@ { for (i = 0 ; i < ctx->msgcount ; i++) if (ctx->hdrs[i]->deleted && !ctx->hdrs[i]->appended @@ -168,11 +156,9 @@ Index: trash/mx.c && mutt_append_message (ctx_trash, ctx, ctx->hdrs[i], 0, 0) == -1) { mx_close_mailbox (ctx_trash, NULL); -Index: trash/pager.c -=================================================================== ---- trash.orig/pager.c 2006-12-12 14:15:03.000000000 +0100 -+++ trash/pager.c 2007-02-15 19:39:57.482112120 +0100 -@@ -2254,12 +2254,15 @@ search_next: +--- a/pager.c ++++ b/pager.c +@@ -2272,12 +2272,15 @@ MAYBE_REDRAW (redraw); break; @@ -188,7 +174,7 @@ Index: trash/pager.c if (option (OPTDELETEUNTAG)) mutt_set_flag (Context, extra->hdr, M_TAG, 0); redraw = REDRAW_STATUS | REDRAW_INDEX; -@@ -2572,6 +2575,7 @@ search_next: +@@ -2590,6 +2593,7 @@ CHECK_ACL(M_ACL_DELETE, _("undelete message")); mutt_set_flag (Context, extra->hdr, M_DELETE, 0); @@ -196,7 +182,7 @@ Index: trash/pager.c redraw = REDRAW_STATUS | REDRAW_INDEX; if (option (OPTRESOLVE)) { -@@ -2587,9 +2591,11 @@ search_next: +@@ -2605,9 +2609,11 @@ CHECK_ACL(M_ACL_DELETE, _("undelete message(s)")); r = mutt_thread_set_flag (extra->hdr, M_DELETE, 0, @@ -209,11 +195,9 @@ Index: trash/pager.c { if (option (OPTRESOLVE)) { -Index: trash/pattern.c -=================================================================== ---- trash.orig/pattern.c 2007-01-25 21:44:41.000000000 +0100 -+++ trash/pattern.c 2007-02-15 19:39:57.483111968 +0100 -@@ -1338,8 +1338,10 @@ int mutt_pattern_func (int op, char *pro +--- a/pattern.c ++++ b/pattern.c +@@ -1344,8 +1344,10 @@ { switch (op) { @@ -227,5 +211,8 @@ Index: trash/pattern.c break; --- a/PATCHES +++ b/PATCHES -@@ -0,0 +1 @@ +@@ -1,3 +1,4 @@ +patch-1.5.13.cd.purge_message.3.4 + patch-1.5.13.nt+ab.xtitles.4 + patch-1.5.6.dw.maildir-mtime.1 + patch-1.5.13.cd.ifdef.2 diff --git a/debian/patches/features/trash-folder b/debian/patches/features/trash-folder index 718c082..b0b9158 100644 --- a/debian/patches/features/trash-folder +++ b/debian/patches/features/trash-folder @@ -48,7 +48,7 @@ To sum up, it's more integrated and transparent to the user. == END PATCH --- a/commands.c +++ b/commands.c -@@ -688,6 +688,7 @@ int _mutt_save_message (HEADER *h, CONTE +@@ -693,6 +693,7 @@ if (option (OPTDELETEUNTAG)) mutt_set_flag (Context, h, M_TAG, 0); } @@ -58,7 +58,7 @@ To sum up, it's more integrated and transparent to the user. } --- a/flags.c +++ b/flags.c -@@ -69,7 +69,13 @@ void _mutt_set_flag (CONTEXT *ctx, HEADE +@@ -65,7 +65,13 @@ { h->deleted = 0; update = 1; @@ -73,7 +73,7 @@ To sum up, it's more integrated and transparent to the user. #ifdef USE_IMAP /* see my comment above */ if (ctx->magic == M_IMAP) -@@ -91,6 +97,17 @@ void _mutt_set_flag (CONTEXT *ctx, HEADE +@@ -87,6 +93,17 @@ } break; @@ -93,7 +93,7 @@ To sum up, it's more integrated and transparent to the user. if (!mutt_bit_isset(ctx->rights,M_ACL_SEEN)) --- a/globals.h +++ b/globals.h -@@ -142,6 +142,7 @@ WHERE char *StChars; +@@ -138,6 +138,7 @@ WHERE char *Status; WHERE char *Tempdir; WHERE char *Tochars; @@ -103,7 +103,7 @@ To sum up, it's more integrated and transparent to the user. WHERE char *XtermTitle; --- a/imap/message.c +++ b/imap/message.c -@@ -816,6 +816,7 @@ int imap_copy_messages (CONTEXT* ctx, HE +@@ -859,6 +859,7 @@ if (ctx->hdrs[n]->tagged) { mutt_set_flag (ctx, ctx->hdrs[n], M_DELETE, 1); @@ -111,7 +111,7 @@ To sum up, it's more integrated and transparent to the user. if (option (OPTDELETEUNTAG)) mutt_set_flag (ctx, ctx->hdrs[n], M_TAG, 0); } -@@ -823,6 +824,7 @@ int imap_copy_messages (CONTEXT* ctx, HE +@@ -866,6 +867,7 @@ else { mutt_set_flag (ctx, h, M_DELETE, 1); @@ -121,9 +121,9 @@ To sum up, it's more integrated and transparent to the user. } --- a/init.h +++ b/init.h -@@ -2881,6 +2881,16 @@ struct option_t MuttVars[] = { +@@ -3138,6 +3138,16 @@ ** by \fIyou\fP. The sixth character is used to indicate when a mail - ** was sent to a mailing-list you subscribe to (default: L). + ** was sent to a mailing-list you subscribe to. */ + { "trash", DT_PATH, R_NONE, UL &TrashPath, 0 }, + /* @@ -140,7 +140,7 @@ To sum up, it's more integrated and transparent to the user. /* --- a/mutt.h +++ b/mutt.h -@@ -201,6 +201,7 @@ enum +@@ -181,6 +181,7 @@ M_DELETE, M_UNDELETE, M_DELETED, @@ -148,7 +148,7 @@ To sum up, it's more integrated and transparent to the user. M_FLAG, M_TAG, M_UNTAG, -@@ -712,6 +713,7 @@ typedef struct header +@@ -693,6 +694,7 @@ unsigned int mime : 1; /* has a MIME-Version header? */ unsigned int flagged : 1; /* marked important? */ unsigned int tagged : 1; @@ -156,7 +156,7 @@ To sum up, it's more integrated and transparent to the user. unsigned int deleted : 1; unsigned int changed : 1; unsigned int attach_del : 1; /* has an attachment marked for deletion */ -@@ -883,6 +885,7 @@ typedef struct _context +@@ -864,6 +866,7 @@ int new; /* how many new messages? */ int unread; /* how many unread messages? */ int deleted; /* how many deleted messages */ @@ -166,7 +166,7 @@ To sum up, it's more integrated and transparent to the user. --- a/muttlib.c +++ b/muttlib.c -@@ -1430,7 +1430,9 @@ int mutt_save_confirm (const char *s, st +@@ -1445,7 +1445,9 @@ if (magic > 0 && !mx_access (s, W_OK)) { @@ -179,7 +179,7 @@ To sum up, it's more integrated and transparent to the user. if ((rc = mutt_yesorno (tmp, M_YES)) == M_NO) --- a/mx.c +++ b/mx.c -@@ -803,6 +803,53 @@ static int sync_mailbox (CONTEXT *ctx, i +@@ -803,6 +803,53 @@ return rc; } @@ -233,7 +233,7 @@ To sum up, it's more integrated and transparent to the user. /* save changes and close mailbox */ int mx_close_mailbox (CONTEXT *ctx, int *index_hint) { -@@ -938,6 +985,7 @@ int mx_close_mailbox (CONTEXT *ctx, int +@@ -938,6 +985,7 @@ if (mutt_append_message (&f, ctx, ctx->hdrs[i], 0, CH_UPDATE_LEN) == 0) { mutt_set_flag (ctx, ctx->hdrs[i], M_DELETE, 1); @@ -241,7 +241,7 @@ To sum up, it's more integrated and transparent to the user. } else { -@@ -959,6 +1007,14 @@ int mx_close_mailbox (CONTEXT *ctx, int +@@ -959,6 +1007,14 @@ return 0; } @@ -256,7 +256,7 @@ To sum up, it's more integrated and transparent to the user. #ifdef USE_IMAP /* allow IMAP to preserve the deleted flag across sessions */ if (ctx->magic == M_IMAP) -@@ -1154,6 +1210,12 @@ int mx_sync_mailbox (CONTEXT *ctx, int * +@@ -1154,6 +1210,12 @@ msgcount = ctx->msgcount; deleted = ctx->deleted; @@ -271,7 +271,7 @@ To sum up, it's more integrated and transparent to the user. rc = imap_sync_mailbox (ctx, purge, index_hint); --- a/postpone.c +++ b/postpone.c -@@ -279,6 +279,9 @@ int mutt_get_postponed (CONTEXT *ctx, HE +@@ -276,6 +276,9 @@ /* finished with this message, so delete it. */ mutt_set_flag (PostContext, h, M_DELETE, 1); diff --git a/debian/patches/features/xtitles b/debian/patches/features/xtitles index 6419282..7d5a6cb 100644 --- a/debian/patches/features/xtitles +++ b/debian/patches/features/xtitles @@ -12,7 +12,7 @@ This is the xterm title patch as found on the mutt mailing lists. == END PATCH --- a/curs_main.c +++ b/curs_main.c -@@ -112,6 +112,19 @@ static const char *No_visible = N_("No v +@@ -110,6 +110,19 @@ extern size_t UngetCount; @@ -32,7 +32,7 @@ This is the xterm title patch as found on the mutt mailing lists. void index_make_entry (char *s, size_t l, MUTTMENU *menu, int num) { format_flag flag = M_FORMAT_MAKEPRINT | M_FORMAT_ARROWCURSOR | M_FORMAT_INDEX; -@@ -574,6 +587,13 @@ int mutt_index_menu (void) +@@ -566,6 +579,13 @@ SETCOLOR (MT_COLOR_NORMAL); BKGDSET (MT_COLOR_NORMAL); menu->redraw &= ~REDRAW_STATUS; @@ -48,7 +48,7 @@ This is the xterm title patch as found on the mutt mailing lists. menu->redraw = 0; --- a/globals.h +++ b/globals.h -@@ -145,6 +145,8 @@ WHERE char *Tempdir; +@@ -140,6 +140,8 @@ WHERE char *Tochars; WHERE char *Username; WHERE char *Visual; @@ -59,7 +59,7 @@ This is the xterm title patch as found on the mutt mailing lists. WHERE char *LastFolder; --- a/init.c +++ b/init.c -@@ -1870,6 +1870,26 @@ static int parse_set (BUFFER *tmp, BUFFE +@@ -1892,6 +1892,26 @@ toggle_option (MuttVars[idx].data); else set_option (MuttVars[idx].data); @@ -88,8 +88,8 @@ This is the xterm title patch as found on the mutt mailing lists. DTYPE (MuttVars[idx].type) == DT_PATH || --- a/init.h +++ b/init.h -@@ -3104,6 +3104,27 @@ struct option_t MuttVars[] = { - ** option does nothing: mutt will never write out the BCC header +@@ -3285,6 +3285,27 @@ + ** option does nothing: mutt will never write out the ``Bcc:'' header ** in this case. */ + {"xterm_icon", DT_STR, R_BOTH, UL &XtermIcon, UL "M%?n?AIL&ail?"}, @@ -118,7 +118,7 @@ This is the xterm title patch as found on the mutt mailing lists. }; --- a/mutt.h +++ b/mutt.h -@@ -458,6 +458,7 @@ enum +@@ -438,6 +438,7 @@ OPTWRAPSEARCH, OPTWRITEBCC, /* write out a bcc header? */ OPTXMAILER, @@ -128,7 +128,7 @@ This is the xterm title patch as found on the mutt mailing lists. OPTCRYPTUSEPKA, --- a/pager.c +++ b/pager.c -@@ -1767,6 +1767,13 @@ mutt_pager (const char *banner, const ch +@@ -1761,6 +1761,13 @@ mutt_paddstr (COLS, IsHeader (extra) || IsMsgAttach (extra) ? buffer : banner); BKGDSET (MT_COLOR_NORMAL); SETCOLOR (MT_COLOR_NORMAL); @@ -144,7 +144,7 @@ This is the xterm title patch as found on the mutt mailing lists. if ((redraw & REDRAW_INDEX) && index) --- a/status.c +++ b/status.c -@@ -195,6 +195,8 @@ status_format_str (char *buf, size_t buf +@@ -195,6 +195,8 @@ break; case 'P': @@ -155,16 +155,18 @@ This is the xterm title patch as found on the mutt mailing lists. else --- a/mutt_menu.h +++ b/mutt_menu.h -@@ -103,6 +103,8 @@ void menu_current_middle (MUTTMENU *); +@@ -103,6 +103,8 @@ void menu_current_bottom (MUTTMENU *); void menu_check_recenter (MUTTMENU *); void menu_status_line (char *, size_t, MUTTMENU *, const char *); +void set_xterm_title_bar (char *title); +void set_xterm_icon_name (char *name); - MUTTMENU *mutt_new_menu (void); + MUTTMENU *mutt_new_menu (int); void mutt_menuDestroy (MUTTMENU **); --- a/PATCHES +++ b/PATCHES -@@ -0,0 +1 @@ +@@ -1,2 +1,3 @@ +patch-1.5.13.nt+ab.xtitles.4 + patch-1.5.6.dw.maildir-mtime.1 + patch-1.5.13.cd.ifdef.2 diff --git a/debian/patches/mutt-patched/sidebar-compat-revert.debian b/debian/patches/mutt-patched/sidebar-compat-revert.debian index cabd8a2..8131b66 100644 --- a/debian/patches/mutt-patched/sidebar-compat-revert.debian +++ b/debian/patches/mutt-patched/sidebar-compat-revert.debian @@ -11,7 +11,7 @@ new sidebar patch version which turned out to be too error-prone. [see sidebar-compat-apply for part 2] --- a/buffy.c +++ b/buffy.c -@@ -383,20 +383,10 @@ int mutt_buffy_check (int force) +@@ -383,20 +383,10 @@ if (*de->d_name != '.' && (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T'))) { @@ -38,9 +38,9 @@ new sidebar patch version which turned out to be too error-prone. closedir (dirp); --- a/buffy.h +++ b/buffy.h -@@ -25,7 +25,6 @@ typedef struct buffy_t +@@ -25,7 +25,6 @@ char *path; - long size; + off_t size; struct buffy_t *next; - time_t mtime; /* for maildirs...time of newest entry */ short new; /* mailbox has new mail */ -- 2.43.0