1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596
|
# vi: ft=diff
This is the edit threads patch by Cedric Duval <cedricduval+web@free.fr>.
The home page for this patch is:
http://cedricduval.free.fr/mutt/patches/#threads
* Patch last synced with upstream:
- Date: 2004-08-10
- File: http://cedricduval.free.fr/mutt/patches/download/patch-1.5.5.1.cd.edit_threads.9.5
* Changes made:
- modified mutt.h part to apply cleanly.
- removed diffs for the following files: acconfig.h, configure,
configure.in, config.h.in.
== END PATCH
diff -pruN mutt-1.5.5.1-orig/OPS mutt-1.5.5.1/OPS
--- mutt-1.5.5.1-orig/OPS Wed Nov 5 10:41:31 2003
+++ mutt-1.5.5.1/OPS Tue Nov 11 02:52:33 2003
@@ -96,6 +96,7 @@ OP_LAST_ENTRY "move to the last entry"
OP_LIST_REPLY "reply to specified mailing list"
OP_MACRO "execute a macro"
OP_MAIL "compose a new mail message"
+OP_MAIN_BREAK_THREAD "break the thread in two"
OP_MAIN_CHANGE_FOLDER "open a different folder"
OP_MAIN_CHANGE_FOLDER_READONLY "open a different folder in read only mode"
OP_MAIN_CLEAR_FLAG "clear a status flag from a message"
@@ -105,6 +106,7 @@ OP_MAIN_FETCH_MAIL "retrieve mail from P
OP_MAIN_FIRST_MESSAGE "move to the first message"
OP_MAIN_LAST_MESSAGE "move to the last message"
OP_MAIN_LIMIT "show only messages matching a pattern"
+OP_MAIN_LINK_THREADS "link tagged message to the current one"
OP_MAIN_NEXT_NEW "jump to the next new message"
OP_MAIN_NEXT_NEW_THEN_UNREAD "jump to the next new or unread message"
OP_MAIN_NEXT_SUBTHREAD "jump to the next subthread"
diff -pruN mutt-1.5.5.1-orig/copy.c mutt-1.5.5.1/copy.c
--- mutt-1.5.5.1-orig/copy.c Wed Nov 5 10:41:31 2003
+++ mutt-1.5.5.1/copy.c Tue Nov 11 02:52:33 2003
@@ -95,6 +95,12 @@ mutt_copy_hdr (FILE *in, FILE *out, long
(ascii_strncasecmp ("Content-Length:", buf, 15) == 0 ||
ascii_strncasecmp ("Lines:", buf, 6) == 0))
continue;
+ if ((flags & CH_UPDATE_REFS) &&
+ ascii_strncasecmp ("References:", buf, 11) == 0)
+ continue;
+ if ((flags & CH_UPDATE_IRT) &&
+ ascii_strncasecmp ("In-Reply-To:", buf, 12) == 0)
+ continue;
ignore = 0;
}
@@ -193,6 +199,12 @@ mutt_copy_hdr (FILE *in, FILE *out, long
ascii_strncasecmp ("type:", buf + 8, 5) == 0)) ||
ascii_strncasecmp ("mime-version:", buf, 13) == 0))
continue;
+ if ((flags & CH_UPDATE_REFS) &&
+ ascii_strncasecmp ("References:", buf, 11) == 0)
+ continue;
+ if ((flags & CH_UPDATE_IRT) &&
+ ascii_strncasecmp ("In-Reply-To:", buf, 12) == 0)
+ continue;
/* Find x -- the array entry where this header is to be saved */
if (flags & CH_REORDER)
@@ -326,6 +338,8 @@ mutt_copy_hdr (FILE *in, FILE *out, long
CH_XMIT ignore Lines: and Content-Length:
CH_WEED do header weeding
CH_NOQFROM ignore ">From " line
+ CH_UPDATE_IRT update the In-Reply-To: header
+ CH_UPDATE_REFS update the References: header
prefix
string to use if CH_PREFIX is set
@@ -335,6 +349,9 @@ int
mutt_copy_header (FILE *in, HEADER *h, FILE *out, int flags, const char *prefix)
{
char buffer[SHORT_STRING];
+
+ flags |= (h->irt_changed ? CH_UPDATE_IRT : 0)
+ | (h->refs_changed ? CH_UPDATE_REFS : 0);
if (mutt_copy_hdr (in, out, h->offset, h->content->offset, flags, prefix) == -1)
return (-1);
@@ -358,7 +375,56 @@ mutt_copy_header (FILE *in, HEADER *h, F
if (flags & CH_UPDATE)
{
if ((flags & CH_NOSTATUS) == 0)
+#ifdef IMAP_EDIT_THREADS
+#define NEW_ENV new_env
+#else
+#define NEW_ENV env
+#endif
{
+ if (h->irt_changed && h->NEW_ENV->in_reply_to)
+ {
+ LIST *listp = h->NEW_ENV->in_reply_to;
+
+ if (fputs ("In-Reply-To: ", out) == EOF)
+ return (-1);
+
+ for (; listp; listp = listp->next)
+ if ((fputs (listp->data, out) == EOF) || (fputc (' ', out) == EOF))
+ return (-1);
+
+ if (fputc ('\n', out) == EOF)
+ return (-1);
+ }
+
+ if (h->refs_changed && h->NEW_ENV->references)
+ {
+ LIST *listp = h->NEW_ENV->references, *refs = NULL, *t;
+
+ if (fputs ("References: ", out) == EOF)
+ return (-1);
+
+ /* Mutt stores references in reverse order, thus we create
+ * a reordered refs list that we can put in the headers */
+ for (; listp; listp = listp->next, refs = t)
+ {
+ t = (LIST *)safe_malloc (sizeof (LIST));
+ t->data = listp->data;
+ t->next = refs;
+ }
+
+ for (; refs; refs = refs->next)
+ if ((fputs (refs->data, out) == EOF) || (fputc (' ', out) == EOF))
+ return (-1);
+
+ /* clearing refs from memory */
+ for (t = refs; refs; refs = t->next, t = refs)
+ safe_free ((void **)&refs);
+
+ if (fputc ('\n', out) == EOF)
+ return (-1);
+ }
+#undef NEW_ENV
+
if (h->old || h->read)
{
if (fputs ("Status: ", out) == EOF)
diff -pruN mutt-1.5.5.1-orig/curs_main.c mutt-1.5.5.1/curs_main.c
--- mutt-1.5.5.1-orig/curs_main.c Wed Nov 5 10:41:31 2003
+++ mutt-1.5.5.1/curs_main.c Tue Nov 11 02:52:33 2003
@@ -930,6 +930,11 @@ CHECK_IMAP_ACL(IMAP_ACL_DELETE);
else
{
mutt_set_flag (Context, CURHDR, M_TAG, !CURHDR->tagged);
+
+ Context->last_tag = CURHDR->tagged ? CURHDR :
+ ((Context->last_tag == CURHDR && !CURHDR->tagged)
+ ? NULL : Context->last_tag);
+
menu->redraw = REDRAW_STATUS;
if (option (OPTRESOLVE) && menu->current < Context->vcount - 1)
{
@@ -1162,6 +1167,89 @@ CHECK_IMAP_ACL(IMAP_ACL_DELETE);
}
done = 1;
}
+ break;
+
+ case OP_MAIN_BREAK_THREAD:
+
+ CHECK_MSGCOUNT;
+ CHECK_VISIBLE;
+ CHECK_READONLY;
+
+ if ((Sort & SORT_MASK) != SORT_THREADS)
+ mutt_error _("Threading is not enabled.");
+
+#if defined (USE_IMAP) && ! defined (IMAP_EDIT_THREADS)
+ else if (Context->magic == M_IMAP)
+ mutt_error _("Compile Mutt with --enable-imap-edit-threads for break-thread support");
+#endif
+
+ else
+ {
+ {
+ HEADER *oldcur = CURHDR;
+
+ mutt_break_thread (CURHDR);
+ mutt_sort_headers (Context, 1);
+ menu->current = oldcur->virtual;
+ }
+
+ Context->changed = 1;
+ mutt_message _("Thread broken");
+
+ if (menu->menu == MENU_PAGER)
+ {
+ op = OP_DISPLAY_MESSAGE;
+ continue;
+ }
+ else
+ menu->redraw |= REDRAW_INDEX;
+ }
+
+ break;
+
+ case OP_MAIN_LINK_THREADS:
+
+ CHECK_MSGCOUNT;
+ CHECK_VISIBLE;
+ CHECK_READONLY;
+
+ if ((Sort & SORT_MASK) != SORT_THREADS)
+ mutt_error _("Threading is not enabled.");
+
+#if defined (USE_IMAP) && ! defined (IMAP_EDIT_THREADS)
+ else if (Context->magic == M_IMAP)
+ mutt_error _("Compile Mutt with --enable-imap-edit-threads for link-threads support");
+#endif
+
+ else if (!CURHDR->env->message_id)
+ mutt_error _("No Message-ID: header available to link thread");
+ else if (!tag && (!Context->last_tag || !Context->last_tag->tagged))
+ mutt_error _("First, please tag a message to be linked here");
+ else
+ {
+ HEADER *oldcur = CURHDR;
+
+ if (mutt_link_threads (CURHDR, tag ? NULL : Context->last_tag,
+ Context))
+ {
+ mutt_sort_headers (Context, 1);
+ menu->current = oldcur->virtual;
+
+ Context->changed = 1;
+ mutt_message _("Threads linked");
+ }
+ else
+ mutt_error _("No thread linked");
+ }
+
+ if (menu->menu == MENU_PAGER)
+ {
+ op = OP_DISPLAY_MESSAGE;
+ continue;
+ }
+ else
+ menu->redraw |= REDRAW_STATUS | REDRAW_INDEX;
+
break;
case OP_EDIT_TYPE:
diff -pruN mutt-1.5.5.1-orig/doc/manual.sgml.head mutt-1.5.5.1/doc/manual.sgml.head
--- mutt-1.5.5.1-orig/doc/manual.sgml.head Wed Nov 5 10:41:34 2003
+++ mutt-1.5.5.1/doc/manual.sgml.head Tue Nov 11 02:52:33 2003
@@ -2170,8 +2170,43 @@ used a threaded news client, this is the
with large volume mailing lists easier because you can easily delete
uninteresting threads and quickly find topics of value.
+<sect1>Editing threads
+<p>
+Mutt has the ability to dynamically restructure threads that are broken
+either by misconfigured software or bad behaviour from some
+correspondents. This allows to clean your mailboxes formats) from these
+annoyances which make it hard to follow a discussion.
+
+If you want to use these functions with IMAP, you need to compile Mutt
+with the <em/--enable-imap-edit-threads/ configure flag.
+
+<sect2>Linking threads
+<p>
+
+Some mailers tend to "forget" to correctly set the "In-Reply-To:" and
+"References:" headers when replying to a message. This results in broken
+discussions because Mutt has not enough information to guess the correct
+threading.
+You can fix this by tagging the reply, then moving to the parent message
+and using the ``link-threads'' function (bound to & by default). The
+reply will then be connected to this "parent" message.
+
+You can also connect multiple childs at once, tagging them and using the
+tag-prefix command (';') or the auto_tag option.
+
+<sect2>Breaking threads
+<p>
+
+On mailing lists, some people are in the bad habit of starting a new
+discussion by hitting "reply" to any message from the list and changing
+the subject to a totally unrelated one.
+You can fix such threads by using the ``break-thread'' function (bound
+by default to #), which will turn the subthread starting from the
+current message into a whole different thread.
+
<sect1>Delivery Status Notification (DSN) Support
<p>
+
RFC1894 defines a set of MIME content types for relaying information
about the status of electronic mail messages. These can be thought of as
``return receipts.'' Berkeley sendmail 8.8.x currently has some command
diff -pruN mutt-1.5.5.1-orig/functions.h mutt-1.5.5.1/functions.h
--- mutt-1.5.5.1-orig/functions.h Wed Nov 5 10:41:31 2003
+++ mutt-1.5.5.1/functions.h Tue Nov 11 02:52:33 2003
@@ -69,6 +69,7 @@ struct binding_t OpGeneric[] = {
struct binding_t OpMain[] = {
{ "create-alias", OP_CREATE_ALIAS, "a" },
{ "bounce-message", OP_BOUNCE_MESSAGE, "b" },
+ { "break-thread", OP_MAIN_BREAK_THREAD, "#" },
{ "change-folder", OP_MAIN_CHANGE_FOLDER, "c" },
{ "change-folder-readonly", OP_MAIN_CHANGE_FOLDER_READONLY, "\033c" },
{ "collapse-thread", OP_MAIN_COLLAPSE_THREAD, "\033v" },
@@ -95,6 +96,7 @@ struct binding_t OpMain[] = {
{ "next-undeleted", OP_MAIN_NEXT_UNDELETED, "j" },
{ "previous-undeleted", OP_MAIN_PREV_UNDELETED, "k" },
{ "limit", OP_MAIN_LIMIT, "l" },
+ { "link-threads", OP_MAIN_LINK_THREADS, "&" },
{ "list-reply", OP_LIST_REPLY, "L" },
{ "mail", OP_MAIL, "m" },
{ "toggle-new", OP_TOGGLE_NEW, "N" },
@@ -153,6 +155,7 @@ struct binding_t OpMain[] = {
};
struct binding_t OpPager[] = {
+ { "break-thread", OP_MAIN_BREAK_THREAD, "#" },
{ "create-alias", OP_CREATE_ALIAS, "a" },
{ "bounce-message", OP_BOUNCE_MESSAGE, "b" },
{ "change-folder", OP_MAIN_CHANGE_FOLDER, "c" },
@@ -175,6 +178,7 @@ struct binding_t OpPager[] = {
{ "next-entry", OP_NEXT_ENTRY, "J" },
{ "previous-undeleted",OP_MAIN_PREV_UNDELETED, "k" },
{ "previous-entry", OP_PREV_ENTRY, "K" },
+ { "link-threads", OP_MAIN_LINK_THREADS, "&" },
{ "list-reply", OP_LIST_REPLY, "L" },
{ "redraw-screen", OP_REDRAW, "\014" },
{ "mail", OP_MAIL, "m" },
diff -pruN mutt-1.5.5.1-orig/imap/imap.c mutt-1.5.5.1/imap/imap.c
--- mutt-1.5.5.1-orig/imap/imap.c Wed Nov 5 10:41:36 2003
+++ mutt-1.5.5.1/imap/imap.c Tue Nov 11 02:52:33 2003
@@ -980,9 +980,11 @@ int imap_sync_mailbox (CONTEXT* ctx, int
mutt_buffer_addstr (&cmd, "UID STORE ");
mutt_buffer_addstr (&cmd, uid);
- /* if attachments have been deleted we delete the message and reupload
- * it. This works better if we're expunging, of course. */
- if (ctx->hdrs[n]->attach_del)
+ /* if the message has been rethreaded or attachments have been deleted
+ * we delete the message and reupload it.
+ * This works better if we're expunging, of course. */
+ if (ctx->hdrs[n]->refs_changed || ctx->hdrs[n]->irt_changed ||
+ ctx->hdrs[n]->attach_del)
{
dprint (3, (debugfile, "imap_sync_mailbox: Attachments to be deleted, falling back to _mutt_save_message\n"));
if (!appendctx)
diff -pruN mutt-1.5.5.1-orig/main.c mutt-1.5.5.1/main.c
--- mutt-1.5.5.1-orig/main.c Tue Mar 4 08:49:48 2003
+++ mutt-1.5.5.1/main.c Tue Nov 11 02:52:33 2003
@@ -228,6 +228,12 @@ static void show_version (void)
"-USE_IMAP "
#endif
+#ifdef IMAP_EDIT_THREADS
+ "+IMAP_EDIT_THREADS "
+#else
+ "-IMAP_EDIT_THREADS "
+#endif
+
#ifdef USE_GSS
"+USE_GSS "
#else
diff -pruN mutt-1.5.5.1-orig/mh.c mutt-1.5.5.1/mh.c
--- mutt-1.5.5.1-orig/mh.c Wed Nov 5 10:41:32 2003
+++ mutt-1.5.5.1/mh.c Tue Nov 11 02:52:33 2003
@@ -1220,7 +1220,7 @@ static int mh_sync_message (CONTEXT * ct
{
HEADER *h = ctx->hdrs[msgno];
- if (h->attach_del)
+ if (h->attach_del || h->refs_changed || h->irt_changed)
if (mh_rewrite_message (ctx, msgno) != 0)
return -1;
@@ -1231,9 +1231,9 @@ static int maildir_sync_message (CONTEXT
{
HEADER *h = ctx->hdrs[msgno];
- if (h->attach_del)
+ if (h->attach_del || h->refs_changed || h->irt_changed)
{
- /* when doing attachment deletion, fall back to the MH case. */
+ /* when doing attachment deletion/rethreading, fall back to the MH case. */
if (mh_rewrite_message (ctx, msgno) != 0)
return (-1);
}
diff -pruN mutt-1.5.5.1-orig/mutt.h mutt-1.5.5.1/mutt.h
--- mutt-1.5.5.1-orig/mutt.h Wed Nov 5 10:41:32 2003
+++ mutt-1.5.5.1/mutt.h Tue Nov 11 02:52:33 2003
@@ -92,6 +92,8 @@
#define CH_WEED_DELIVERED (1<<13) /* weed eventual Delivered-To headers */
#define CH_FORCE_FROM (1<<14) /* give CH_FROM precedence over CH_WEED? */
#define CH_NOQFROM (1<<15) /* give CH_FROM precedence over CH_WEED? */
+#define CH_UPDATE_IRT (1<<16) /* update In-Reply-To: */
+#define CH_UPDATE_REFS (1<<17) /* update References: */
/* flags for mutt_enter_string() */
#define M_ALIAS 1 /* do alias "completion" by calling up the alias-menu */
@@ -506,8 +508,9 @@ typedef struct list_t
#define mutt_new_list() safe_calloc (1, sizeof (LIST))
void mutt_free_list (LIST **);
void mutt_free_rx_list (RX_LIST **);
void mutt_free_spam_list (SPAM_LIST **);
+LIST *mutt_copy_list (LIST *);
int mutt_matches_ignore (const char *, LIST *);
/* add an element to a list */
@@ -647,6 +650,8 @@ typedef struct header
unsigned int subject_changed : 1; /* used for threading */
unsigned int threaded : 1; /* used for threading */
unsigned int display_subject : 1; /* used for threading */
+ unsigned int irt_changed : 1; /* In-Reply-To changed to link/break threads */
+ unsigned int refs_changed : 1; /* References changed to break thread */
unsigned int recip_valid : 1; /* is_recipient is valid */
unsigned int active : 1; /* message is not to be removed */
unsigned int trash : 1; /* message is marked as trashed on disk.
@@ -687,6 +692,10 @@ typedef struct header
char *tree; /* character string to print thread tree */
struct thread *thread;
+#ifdef IMAP_EDIT_THREADS
+ ENVELOPE *new_env; /* envelope information for rethreading */
+#endif
+
#ifdef MIXMASTER
LIST *chain;
#endif
@@ -752,6 +761,7 @@ typedef struct
char *pattern; /* limit pattern string */
pattern_t *limit_pattern; /* compiled limit pattern */
HEADER **hdrs;
+ HEADER *last_tag; /* last tagged msg. used to link threads */
THREAD *tree; /* top of thread tree */
HASH *id_hash; /* hash table by msg id */
HASH *subj_hash; /* hash table by subject */
diff -pruN mutt-1.5.5.1-orig/mx.c mutt-1.5.5.1/mx.c
--- mutt-1.5.5.1-orig/mx.c Wed Nov 5 10:41:32 2003
+++ mutt-1.5.5.1/mx.c Tue Nov 11 02:52:33 2003
@@ -1161,6 +1161,8 @@ int mx_sync_mailbox (CONTEXT *ctx, int *
ctx->deleted = 0;
}
}
+ else if (ctx->last_tag && ctx->last_tag->deleted)
+ ctx->last_tag = NULL; /* reset last tagged msg now useless */
}
/* really only for IMAP - imap_sync_mailbox results in a call to
diff -pruN mutt-1.5.5.1-orig/pager.c mutt-1.5.5.1/pager.c
--- mutt-1.5.5.1-orig/pager.c Wed Nov 5 10:41:32 2003
+++ mutt-1.5.5.1/pager.c Tue Nov 11 02:52:33 2003
@@ -2481,6 +2481,11 @@ CHECK_IMAP_ACL(IMAP_ACL_WRITE);
case OP_TAG:
CHECK_MODE(IsHeader (extra));
mutt_set_flag (Context, extra->hdr, M_TAG, !extra->hdr->tagged);
+
+ Context->last_tag = extra->hdr->tagged ? extra->hdr :
+ ((Context->last_tag == extra->hdr && !extra->hdr->tagged)
+ ? NULL : Context->last_tag);
+
redraw = REDRAW_STATUS | REDRAW_INDEX;
if (option (OPTRESOLVE))
{
diff -pruN mutt-1.5.5.1-orig/protos.h mutt-1.5.5.1/protos.h
--- mutt-1.5.5.1-orig/protos.h Wed Nov 5 10:41:33 2003
+++ mutt-1.5.5.1/protos.h Tue Nov 11 02:52:33 2003
@@ -146,6 +146,7 @@ void mutt_block_signals (void);
void mutt_block_signals_system (void);
void mutt_body_handler (BODY *, STATE *);
int mutt_bounce_message (FILE *fp, HEADER *, ADDRESS *);
+void mutt_break_thread (HEADER *);
void mutt_buffy (char *, size_t);
int mutt_buffy_list (void);
void mutt_canonical_charset (char *, size_t, const char *);
@@ -286,6 +287,7 @@ int mutt_is_list_recipient (int, ADDRESS
int mutt_is_subscribed_list (ADDRESS *);
int mutt_is_text_part (BODY *);
int mutt_is_valid_mailbox (const char *);
+int mutt_link_threads (HEADER *, HEADER *, CONTEXT *);
int mutt_lookup_mime_type (BODY *, const char *);
int mutt_messages_in_thread (CONTEXT *, HEADER *, int);
int mutt_multi_choice (char *prompt, char *letters);
diff -pruN mutt-1.5.5.1-orig/thread.c mutt-1.5.5.1/thread.c
--- mutt-1.5.5.1-orig/thread.c Wed Nov 5 10:41:34 2003
+++ mutt-1.5.5.1/thread.c Tue Nov 11 02:52:33 2003
@@ -1333,3 +1333,105 @@ HASH *mutt_make_subj_hash (CONTEXT *ctx)
return hash;
}
+
+static void clean_references (THREAD *brk, THREAD *cur)
+{
+ THREAD *p;
+ LIST *ref = NULL;
+ int done = 0;
+
+ for (; cur; cur = cur->next, done = 0)
+ {
+ /* parse subthread recursively */
+ clean_references (brk, cur->child);
+
+ if (!cur->message)
+ break; /* skip pseudo-message */
+
+ /* Looking for the first bad reference according to the new threading.
+ * Optimal since Mutt stores the references in reverse order, and the
+ * first loop should match immediatly for mails respecting RFC2822. */
+ for (p = brk; !done && p; p = p->parent)
+ for (ref = cur->message->env->references; p->message && ref; ref = ref->next)
+ if (!mutt_strcasecmp (ref->data, p->message->env->message_id))
+ {
+ done = 1;
+ break;
+ }
+
+ if (done)
+ {
+ HEADER *h = cur->message;
+
+ /* clearing the References: header from obsolete Message-Id(s) */
+ mutt_free_list (&ref->next);
+
+#ifdef IMAP_EDIT_THREADS
+ if (h->new_env)
+ mutt_free_list (&h->new_env->references);
+ else
+ h->new_env = mutt_new_envelope ();
+
+ h->new_env->references = mutt_copy_list (h->env->references);
+#endif
+
+ h->refs_changed = h->changed = 1;
+ }
+ }
+}
+
+void mutt_break_thread (HEADER *hdr)
+{
+ mutt_free_list (&hdr->env->in_reply_to);
+ mutt_free_list (&hdr->env->references);
+ hdr->irt_changed = hdr->refs_changed = hdr->changed = 1;
+
+#ifdef IMAP_EDIT_THREADS
+ if (hdr->new_env)
+ {
+ mutt_free_list (&hdr->new_env->in_reply_to);
+ mutt_free_list (&hdr->new_env->references);
+ }
+ else
+ hdr->new_env = mutt_new_envelope ();
+#endif
+
+ clean_references (hdr->thread, hdr->thread->child);
+}
+
+static int link_threads (HEADER *parent, HEADER *child, CONTEXT *ctx)
+{
+ if (child == parent)
+ return 0;
+
+ mutt_break_thread (child);
+
+ child->env->in_reply_to = mutt_new_list ();
+ child->env->in_reply_to->data = safe_strdup (parent->env->message_id);
+
+#ifdef IMAP_EDIT_THREADS
+ child->new_env->in_reply_to = mutt_new_list ();
+ child->new_env->in_reply_to->data = safe_strdup (parent->env->message_id);
+#endif
+
+ mutt_set_flag (ctx, child, M_TAG, 0);
+
+ child->irt_changed = child->changed = 1;
+ return 1;
+}
+
+int mutt_link_threads (HEADER *cur, HEADER *last, CONTEXT *ctx)
+{
+ int i, changed = 0;
+
+ if (!last)
+ {
+ for (i = 0; i < ctx->vcount; i++)
+ if (ctx->hdrs[Context->v2r[i]]->tagged)
+ changed |= link_threads (cur, ctx->hdrs[Context->v2r[i]], ctx);
+ }
+ else
+ changed = link_threads (cur, last, ctx);
+
+ return changed;
+}
diff -pruN mutt-1.5.5.1-orig/PATCHES mutt-1.5.5.1/PATCHES
--- mutt-1.5.5.1-orig/PATCHES Tue Apr 15 15:18:34 2003
+++ mutt-1.5.5.1/PATCHES Tue Nov 11 02:52:33 2003
@@ -1,0 +1 @@
+patch-1.5.5.1.cd.edit_threads.9.5
|