summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2009-12-29 10:37:00 +0000
committerFabian Groffen <grobian@gentoo.org>2009-12-29 10:37:00 +0000
commit58d57788673a69db8b39e8775cd0fdc082a25516 (patch)
tree73037273082fa4b115981f908534efe274d96956 /mail-client/mutt/files
parentwhitespace (diff)
downloadgentoo-2-58d57788673a69db8b39e8775cd0fdc082a25516.tar.gz
gentoo-2-58d57788673a69db8b39e8775cd0fdc082a25516.tar.bz2
gentoo-2-58d57788673a69db8b39e8775cd0fdc082a25516.zip
Bump for patch to fix subject not properly being truncated when there are tree arrows on the same line
(Portage version: 2.2.00.15153-prefix/cvs/Darwin powerpc)
Diffstat (limited to 'mail-client/mutt/files')
-rw-r--r--mail-client/mutt/files/mutt-1.5.20-subject-mistruncation-31881f38ca1e.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/mail-client/mutt/files/mutt-1.5.20-subject-mistruncation-31881f38ca1e.patch b/mail-client/mutt/files/mutt-1.5.20-subject-mistruncation-31881f38ca1e.patch
new file mode 100644
index 000000000000..f6f46e40e58b
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.20-subject-mistruncation-31881f38ca1e.patch
@@ -0,0 +1,29 @@
+http://dev.mutt.org/trac/ticket/3364
+http://dev.mutt.org/trac/changeset/31881f38ca1e
+
+Hack mutt_wstr_trunc to treat M_TREE characters as 1 cell.
+Closes #3364.
+
+Index: curs_lib.c
+===================================================================
+--- curs_lib.c (revision 6010:c837ab790d2e)
++++ curs_lib.c (revision 6035:31881f38ca1e)
+@@ -884,5 +884,5 @@
+ wchar_t wc;
+ int w = 0, l = 0, cl;
+- size_t cw, n;
++ int cw, n;
+ mbstate_t mbstate;
+
+@@ -898,5 +898,11 @@
+ cw = cl = 1;
+ else
++ {
+ cw = wcwidth (wc);
++ /* hack because M_TREE symbols aren't turned into characters
++ * until rendered by print_enriched_string (#3364) */
++ if (cw < 0 && cl == 1 && src[0] && src[0] < M_TREE_MAX)
++ cw = 1;
++ }
+ if (cl + l > maxlen || cw + w > maxwid)
+ break;