1 diff -u mutt-1.3.26.old/PATCHES mutt-1.3.26/PATCHES
2 --- mutt-1.3.26.old/PATCHES Tue Jan 15 10:03:20 2002
3 +++ mutt-1.3.26/PATCHES Fri Jan 18 15:54:52 2002
5 +patch-1.3.26.devl.narrow_tree.1
6 diff -u mutt-1.3.26.old/hdrline.c mutt-1.3.26/hdrline.c
7 --- mutt-1.3.26.old/hdrline.c Mon Dec 17 11:04:48 2001
8 +++ mutt-1.3.26/hdrline.c Fri Jan 18 15:54:28 2002
13 +/* do_subject returns the pointer it is given for tree or subject if
14 + * the respective one of them is all the subject that needs to be
15 + * printed. otherwise, it copies the appropriate string into buf
18 +char *do_subject (char *dest, size_t destlen, char *subject, char *tree, int flags, char *buf, size_t bufsize)
22 + if (option (OPTNARROWTREE))
35 + if (*(tree - 1) == '\010')
36 + *(dst - 2) = '\010';
38 + if (flags & M_FORMAT_FORCESUBJ)
40 + mutt_format_s (dest, destlen, "", NONULL (subject));
41 + snprintf (dst, bufsize, "%s", dest);
47 + else if (flags & M_FORMAT_FORCESUBJ)
49 + mutt_format_s (dest, destlen, "", NONULL (subject));
50 + snprintf (buf, bufsize, "%s%s", tree, dest);
57 /* %a = address of author
58 * %b = filename of the originating folder
59 * %B = the list to which the letter was sent
63 if (flags & M_FORMAT_TREE && !hdr->collapsed)
65 - if (flags & M_FORMAT_FORCESUBJ)
67 - mutt_format_s (dest, destlen, "", NONULL (hdr->env->subject));
68 - snprintf (buf2, sizeof (buf2), "%s%s", hdr->tree, dest);
69 - mutt_format_s_tree (dest, destlen, prefix, buf2);
72 - mutt_format_s_tree (dest, destlen, prefix, hdr->tree);
74 + mutt_format_s_tree (dest, destlen, prefix,
75 + do_subject (dest, destlen, hdr->env->subject, hdr->tree, flags, buf2, sizeof (buf2)));
77 mutt_format_s (dest, destlen, prefix, NONULL (hdr->env->subject));
79 diff -u mutt-1.3.26.old/init.h mutt-1.3.26/init.h
80 --- mutt-1.3.26.old/init.h Mon Dec 10 11:09:03 2001
81 +++ mutt-1.3.26/init.h Fri Jan 18 15:54:28 2002
82 @@ -1093,6 +1093,14 @@
83 { "msg_format", DT_SYN, R_NONE, UL "message_format", 0 },
86 + { "narrow_tree", DT_BOOL, R_BOTH, OPTNARROWTREE, 0 },
89 + ** This variable controls the width of the thread tree when sorting by
90 + ** threads. When set, it makes the tree approximately twice as narrow,
91 + ** to allow more room the tree and message subjects. This is useful on
94 { "pager", DT_PATH, R_NONE, UL &Pager, UL "builtin" },
97 diff -u mutt-1.3.26.old/mutt.h mutt-1.3.26/mutt.h
98 --- mutt-1.3.26.old/mutt.h Tue Jan 15 22:00:32 2002
99 +++ mutt-1.3.26/mutt.h Fri Jan 18 15:54:28 2002