[PATCH] optional index_format expandos %r and %R for To: and Cc: recipients

[Derek Schrock]

# HG changeset patch
# User Derek Schrock <der...@lifeofadishwasher.com>
# Date 1442795867 14400
#      Sun Sep 20 20:37:47 2015 -0400
# Branch to_cc
# Node ID 00cb7a8f00ece2ecc4d49bd732a8072bcd235e2f
# Parent  d30daad6b7223b4c11f181bf01c0ed35c54d5a74
optional index_format expandos %r and %R for To: and Cc: recipients

diff -r d30daad6b722 -r 00cb7a8f00ec UPDATING
--- a/UPDATING  Sat Sep 19 19:04:39 2015 -0400
+++ b/UPDATING  Sun Sep 20 20:37:47 2015 -0400
@@ -4,6 +4,10 @@
 The keys used are:
   !: modified feature, -: deleted feature, +: new feature
 
+default (unreleased):
+  + New expandos %r and %R comma separated list of To: and Cc:
+    recipients respectively
+
 1.5.24 (2015-08-31):
 
   + terminal status-line (TS) support, a.k.a. xterm title. see the
diff -r d30daad6b722 -r 00cb7a8f00ec hdrline.c
--- a/hdrline.c Sat Sep 19 19:04:39 2015 -0400
+++ b/hdrline.c Sun Sep 20 20:37:47 2015 -0400
@@ -219,6 +219,8 @@
  * %N = score
  * %O = like %L, except using address instead of name
  * %P = progress indicator for builtin pager
+ * %r = comma separated list of To: recipients
+ * %R = comma separated list of Cc: recipients
  * %s = subject
  * %S = short message status (e.g., N/O/D/!/r/-)
  * %t = `to:' field (recipients)
@@ -548,6 +550,22 @@
       strfcpy(dest, NONULL(hfi->pager_progress), destlen);
       break;
 
+    case 'r':
+      buf2[0] = 0;
+      rfc822_write_address(buf2, sizeof(buf2), hdr->env->to, 1);
+      if(optional && buf2[0] == NULL)
+        optional = 0;
+      mutt_format_s (dest, destlen, prefix, buf2);
+      break;
+
+    case 'R':
+      buf2[0] = 0;
+      rfc822_write_address(buf2, sizeof(buf2), hdr->env->cc, 1);
+      if(optional && buf2[0] == NULL)
+        optional = 0;
+      mutt_format_s (dest, destlen, prefix, buf2);
+      break;
+
     case 's':
       
       if (flags & M_FORMAT_TREE && !hdr->collapsed)
diff -r d30daad6b722 -r 00cb7a8f00ec init.h
--- a/init.h    Sat Sep 19 19:04:39 2015 -0400
+++ b/init.h    Sun Sep 20 20:37:47 2015 -0400
@@ -1311,6 +1311,8 @@
   **            stashed the message: list name or recipient name
   **            if not sent to a list
   ** .dt %P .dd progress indicator for the built-in pager (how much of the 
file has been displayed)
+  ** .dt %r .dd comma separated list of ``To:'' recipients
+  ** .dt %R .dd comma separated list of ``Cc:'' recipients
   ** .dt %s .dd subject of the message
   ** .dt %S .dd status of the message (``N''/``D''/``d''/``!''/``r''/\(as)
   ** .dt %t .dd ``To:'' field (recipients)
diff -r d30daad6b722 -r 00cb7a8f00ec send.c
--- a/send.c    Sat Sep 19 19:04:39 2015 -0400
+++ b/send.c    Sun Sep 20 20:37:47 2015 -0400
@@ -398,7 +398,7 @@
 
 void mutt_make_attribution (CONTEXT *ctx, HEADER *cur, FILE *out)
 {
-  char buffer[STRING];
+  char buffer[LONG_STRING];
   if (Attribution)
   {
     mutt_make_string (buffer, sizeof (buffer), Attribution, ctx, cur);