[gentoo-commits] gentoo-x86 commit in mail-client/mutt/files: mutt-1.5.20-subject-mistruncation-31881f38ca1e.patch

[Fabian Groffen (grobian)]

grobian     09/12/29 10:37:01

  Added:               
                        mutt-1.5.20-subject-mistruncation-31881f38ca1e.patch
  Log:
  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)

Revision  Changes    Path
1.1                  mail-client/mutt/files/mutt-1.5.20-subject-mistruncation-31881f38ca1e.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/files/mutt-1.5.20-subject-mistruncation-31881f38ca1e.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/files/mutt-1.5.20-subject-mistruncation-31881f38ca1e.patch?rev=1.1&content-type=text/plain

Index: mutt-1.5.20-subject-mistruncation-31881f38ca1e.patch
===================================================================
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;