--- mutt-1.5.8/PATCHES~	never
+++ mutt-1.5.8/PATCHES	Sun Mar  6 18:01:13 CST 2005
@@ -1,0 +1 @@
+patch-1.5.8.dgc.softfill.3
diff -Pur mutt-1.5.8-base/commands.c mutt-1.5.8/commands.c
--- mutt-1.5.8-base/commands.c	Sat Feb 12 13:22:15 2005
+++ mutt-1.5.8/commands.c	Sun Mar  6 18:01:13 2005
@@ -284,7 +284,7 @@
   if (mutt_strwidth (prompt) > COLS - extra_space)
   {
     mutt_format_string (prompt, sizeof (prompt),
-			0, COLS-extra_space, 0, 0,
+			0, COLS-extra_space, FMT_LEFT, 0,
 			prompt, sizeof (prompt), 0);
     safe_strcat (prompt, sizeof (prompt), "...?");
   }
diff -Pur mutt-1.5.8-base/curs_lib.c mutt-1.5.8/curs_lib.c
--- mutt-1.5.8-base/curs_lib.c	Thu Feb  3 12:47:52 2005
+++ mutt-1.5.8/curs_lib.c	Sun Mar  6 18:01:13 2005
@@ -304,7 +304,7 @@
   
   dprint (1, (debugfile, "%s\n", Errorbuf));
   mutt_format_string (Errorbuf, sizeof (Errorbuf),
-		      0, COLS-2, 0, 0, Errorbuf, sizeof (Errorbuf), 0);
+		      0, COLS-2, FMT_LEFT, 0, Errorbuf, sizeof (Errorbuf), 0);
 
   if (!option (OPTKEEPQUIET))
   {
@@ -328,7 +328,7 @@
   va_end (ap);
 
   mutt_format_string (Errorbuf, sizeof (Errorbuf),
-		      0, COLS-2, 0, 0, Errorbuf, sizeof (Errorbuf), 0);
+		      0, COLS-2, FMT_LEFT, 0, Errorbuf, sizeof (Errorbuf), 0);
 
   if (!option (OPTKEEPQUIET))
   {
@@ -585,7 +585,7 @@
 
 void mutt_format_string (char *dest, size_t destlen,
 			 int min_width, int max_width,
-			 int right_justify, char m_pad_char,
+			 int justify, char m_pad_char,
 			 const char *s, size_t n,
 			 int arboreal)
 {
@@ -629,7 +629,7 @@
   w = (int)destlen < min_width ? destlen : min_width;
   if (w <= 0)
     *p = '\0';
-  else if (right_justify)
+  else if (justify == FMT_RIGHT)	/* right justify */
   {
     p[w] = '\0';
     while (--p >= dest)
@@ -637,7 +637,27 @@
     while (--w >= 0)
       dest[w] = m_pad_char;
   }
-  else
+  else if (justify == FMT_CENTER)	/* center */
+  {
+    char *savedp = p;
+    int half = (w+1) / 2; /* half of cushion space */
+
+    p[w] = '\0';
+
+    /* move str to center of buffer */
+    while (--p >= dest)
+      p[half] = *p;
+
+    /* fill rhs */
+    p = savedp + half;
+    while (--w >= half)
+      *p++ = m_pad_char;
+
+    /* fill lhs */
+    while (half--)
+      dest[half] = m_pad_char;
+  }
+  else					/* left justify */
   {
     while (--w >= 0)
       *p++ = m_pad_char;
@@ -659,13 +679,15 @@
 			     const char *s,
 			     int arboreal)
 {
-  int right_justify = 1;
+  int justify = FMT_RIGHT;
   char *p;
   int min_width;
   int max_width = INT_MAX;
 
   if (*prefix == '-')
-    ++prefix, right_justify = 0;
+    ++prefix, justify = FMT_LEFT;
+  else if (*prefix == '=')
+    ++prefix, justify = FMT_CENTER;
   min_width = strtol (prefix, &p, 10);
   if (*p == '.')
   {
@@ -676,7 +698,7 @@
   }
 
   mutt_format_string (dest, destlen, min_width, max_width,
-		      right_justify, ' ', s, mutt_strlen (s), arboreal);
+		      justify, ' ', s, mutt_strlen (s), arboreal);
 }
 
 void mutt_format_s (char *dest,
@@ -697,7 +719,7 @@
 
 /*
  * mutt_paddstr (n, s) is almost equivalent to
- * mutt_format_string (bigbuf, big, n, n, 0, ' ', s, big, 0), addstr (bigbuf)
+ * mutt_format_string (bigbuf, big, n, n, FMT_LEFT, ' ', s, big, 0), addstr (bigbuf)
  */
 
 void mutt_paddstr (int n, const char *s)
diff -Pur mutt-1.5.8-base/doc/manual.sgml.head mutt-1.5.8/doc/manual.sgml.head
--- mutt-1.5.8-base/doc/manual.sgml.head	Sat Feb 12 13:41:36 2005
+++ mutt-1.5.8/doc/manual.sgml.head	Sun Mar  6 18:01:13 2005
@@ -1699,6 +1699,63 @@
 argument, or you can remove all hooks of a specific type by saying
 something like <tt/unhook send-hook/.
 
+<sect1>Format strings<label id="format_strings">
+<p>
+Format strings are a general concept you'll find in several locations
+through the mutt configuration, especially in the 
+<ref id="index_format" name="&dollar;index&lowbar;format">,
+<ref id="pager_format" name="&dollar;pager&lowbar;format">,
+<ref id="status_format" name="&dollar;status&lowbar;format">,
+and other ``*_format'' variables. These can be very straightforward,
+and it's quite possible you already know how to use them.
+<p>
+
+The most basic format string element is a percent symbol followed by
+another character. For example, <tt/%s/ represents a message's Subject:
+header in the <ref id="index_format" name="&dollar;index&lowbar;format">
+variable. The ```expandos'' available are documented with each format
+variable, but there are general modifiers available with all formatting
+expandos, too. Those are our concern here.
+<p>
+
+Some of the modifers are borrowed right out of C (though you might
+know them from Perl, Python, shell, or another langugage). These are
+the [-]m.n modifiers, as in <tt/%-12.12s/. As with such programming
+languages, these modifiers allow you to specify the minumum and maximum
+size of the resulting string, as well as its justification. If the ``-''
+sign follows the percent, the string will be left-justified instead of
+right-justified. If there's a number immediately following that, it's
+the minimum amount of space the formatted string will occupy -- if
+it's naturally smaller than that, it will be padded out with spaces.
+If a decimal point and another number follow, that's the maximum space
+allowable -- the string will not be permitted to exceed that width, no
+matter its natural size. Each of these three elements is optional, so
+that all these are legal format strings:
+<tt/%-12s/
+<tt/%4c/
+<tt/%.15F/
+<tt/%-12.15L/
+<p>
+
+Mutt adds some other modifiers to format strings. If you use an equals
+symbol (<tt/=/) as a numeric prefix (like the minus above), it will
+force the string to be centered within its minimum space range. For
+example,
+<tt/%=14y/
+will reserve 14 characters for the %y expansion -- that's the X-Label:
+header, in <tt/$index_format/. If the expansion results in a string
+less than 14 characters, it will be centered in a 14-character space.
+If the X-Label for a message were "test", that expansion would look like
+``     test     ''.
+<p>
+
+There are two very little-known modifiers that affect the way that an
+expando is replaced. If there is an underline (``&lowbar;'') character
+between any format modifiers (as above) and the expando letter, it will
+expands in all lower case. And if you use a colon (``:''), it will
+replace all decimal points with underlines.
+
+
 <sect>Advanced Usage
 
 <sect1>Regular Expressions<label id="regexp">
diff -Pur mutt-1.5.8-base/init.h mutt-1.5.8/init.h
--- mutt-1.5.8-base/init.h	Sat Feb 12 14:01:10 2005
+++ mutt-1.5.8/init.h	Sun Mar  6 18:01:13 2005
@@ -208,7 +208,9 @@
   ** .dt %u  .dd unlink (=to delete) flag
   ** .dt %>X .dd right justify the rest of the string and pad with character "X"
   ** .dt %|X .dd pad to the end of the line with character "X"
+  ** .dt %*X .dd soft-fill with character "X" as pad
   ** .de
+  ** For an explanation of `soft-fill', see the ``$$index_format'' documentation.
   */
   { "attach_sep",	DT_STR,	 R_NONE, UL &AttachSep, UL "\n" },
   /*
@@ -580,7 +582,9 @@
   ** .dt %u  .dd owner name (or numeric uid, if missing)
   ** .dt %>X .dd right justify the rest of the string and pad with character "X"
   ** .dt %|X .dd pad to the end of the line with character "X"
+  ** .dt %*X .dd soft-fill with character "X" as pad
   ** .de
+  ** For an explanation of `soft-fill', see the ``$$index_format'' documentation.
   */
   { "followup_to",	DT_BOOL, R_NONE, OPTFOLLOWUPTO, 1 },
   /*
@@ -978,7 +982,15 @@
   **                function ``strftime''; a leading bang disables locales.
   ** .dt %>X    .dd right justify the rest of the string and pad with character "X"
   ** .dt %|X    .dd pad to the end of the line with character "X"
+  ** .dt %*X    .dd soft-fill with character "X" as pad
   ** .de
+  ** `Soft-fill' deserves some explanation. Normal right-justification
+  ** will print everything to the left of the %>, displaying padding and
+  ** the whatever lies to the right only if there's room. By contrast,
+  ** soft-fill gives priority to the right-hand side, guaranteeing space
+  ** to display it and showing padding only if there's still room. If
+  ** necessary, soft-fill will eat text leftwards to make room for
+  ** rightward text.
   ** .pp
   ** See also: ``$$to_chars''.
   */
@@ -2573,7 +2585,9 @@
   ** .dt %V  .dd currently active limit pattern, if any *
   ** .dt %>X .dd right justify the rest of the string and pad with "X"
   ** .dt %|X .dd pad to the end of the line with "X"
+  ** .dt %*X .dd soft-fill with character "X" as pad
   ** .de
+  ** For an explanation of `soft-fill', see the ``$$index_format'' documentation.
   ** .pp
   ** * = can be optionally printed if nonzero
   ** .pp
diff -Pur mutt-1.5.8-base/lib.h mutt-1.5.8/lib.h
--- mutt-1.5.8-base/lib.h	Sat Feb  5 08:09:14 2005
+++ mutt-1.5.8/lib.h	Sun Mar  6 18:01:13 2005
@@ -84,6 +84,13 @@
 # define MAX(a,b) ((a) < (b) ? (b) : (a))
 # define MIN(a,b) ((a) < (b) ? (a) : (b))
 
+/* For mutt_format_string() justifications */
+/* Making left 0 and center -1 is of course completely nonsensical, but
+ * it retains compatibility for any patches that call mutt_format_string.
+ * Once patches are updated to use FMT_*, these can be made sane. */
+#define FMT_LEFT	0
+#define FMT_RIGHT	1
+#define FMT_CENTER	-1
 
 #define FOREVER while (1)
 
diff -Pur mutt-1.5.8-base/menu.c mutt-1.5.8/menu.c
--- mutt-1.5.8-base/menu.c	Sat Feb 12 14:01:55 2005
+++ mutt-1.5.8/menu.c	Sun Mar  6 18:01:13 2005
@@ -159,7 +159,7 @@
   int shift = option (OPTARROWCURSOR) ? 3 : 0;
   int cols = COLS - shift;
 
-  mutt_format_string (s, n, cols, cols, 0, ' ', s, strlen (s), 1);
+  mutt_format_string (s, n, cols, cols, FMT_LEFT, ' ', s, strlen (s), 1);
   s[n - 1] = 0;
 }
 
diff -Pur mutt-1.5.8-base/muttlib.c mutt-1.5.8/muttlib.c
--- mutt-1.5.8-base/muttlib.c	Sat Feb 12 13:30:16 2005
+++ mutt-1.5.8/muttlib.c	Sun Mar  6 18:01:13 2005
@@ -933,6 +933,7 @@
 {
   char prefix[SHORT_STRING], buf[LONG_STRING], *cp, *wptr = dest, ch;
   char ifstring[SHORT_STRING], elsestring[SHORT_STRING];
+  char remainder[LONG_STRING];
   size_t wlen, count, len, col, wid;
 
   prefix[0] = '\0';
@@ -966,7 +967,7 @@
 	cp = prefix;
 	count = 0;
 	while (count < sizeof (prefix) &&
-	       (isdigit ((unsigned char) *src) || *src == '.' || *src == '-'))
+	       (isdigit ((unsigned char) *src) || *src == '.' || *src == '-' || *src == '='))
 	{
 	  *cp++ = *src++;
 	  count++;
@@ -1058,6 +1059,46 @@
 	}
 	break; /* skip rest of input */
       }
+      /* soft fill */
+      else if (ch == '*')
+      {
+	int space;
+
+	/* truncate to fit remainder, pad with chr. */
+	ch = *src++;	/* pad chr */
+	mutt_FormatString (remainder, sizeof(remainder), src, callback,
+	  data, flags);
+
+	len = mutt_strlen(remainder);
+	space = COLS - wlen - len;	/* bytes remaining unformatted */
+
+	/* if space > 0, this is space that needs to be filled */
+	if (space > 0)
+	{
+	  memset(wptr, ch, space);
+	  wptr += space;
+	  wlen += space;
+	}
+
+	/* if space < 0, there's not enough room for remainder -- backtrack */
+	else if (space < 0) {
+	  wptr += space;
+	  wlen += space;
+	  if (wlen < 0) {
+	    wptr = dest;
+	    wlen = 0;
+	  }
+	}
+
+	/* Since remainder is already formatted, copy it *
+	 * in.  This prevents having to format it twice. */
+	if (len > COLS)
+	  len = COLS;
+	memcpy(wptr, remainder, len);
+	wptr += len;
+	wlen += len;
+      }
+
       else
       {
 	short tolower =  0;
diff -Pur mutt-1.5.8-base/query.c mutt-1.5.8/query.c
--- mutt-1.5.8-base/query.c	Thu Feb  3 12:47:53 2005
+++ mutt-1.5.8/query.c	Sun Mar  6 18:01:13 2005
@@ -203,7 +203,7 @@
 
   mutt_format_string (buf2, sizeof (buf2),
 		      FirstColumn + 2, FirstColumn + 2,
-		      0, ' ', table[num].data->name,
+		      FMT_LEFT, ' ', table[num].data->name,
 		      mutt_strlen (table[num].data->name), 0);
 
   snprintf (s, slen, " %c %3d %s %-*.*s %s", 
diff -Pur mutt-1.5.8-base/recvcmd.c mutt-1.5.8/recvcmd.c
--- mutt-1.5.8-base/recvcmd.c	Thu Feb  3 12:47:53 2005
+++ mutt-1.5.8/recvcmd.c	Sun Mar  6 18:01:13 2005
@@ -182,7 +182,7 @@
   if (mutt_strwidth (prompt) > COLS - extra_space)
   {
     mutt_format_string (prompt, sizeof (prompt) - 4,
-			0, COLS-extra_space, 0, 0,
+			0, COLS-extra_space, FMT_LEFT, 0,
 			prompt, sizeof (prompt), 0);
     safe_strcat (prompt, sizeof (prompt), "...?");
   }