From: Paul Fox <pgf@foxharp.boston.ma.us>
Date: Wed, 7 May 2014 14:19:56 +0000 (-0400)
Subject: modify mhshow marker format to include the size of the part
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/19f21d4d5c17206694b60056ec95bd2c26de91e4

modify mhshow marker format to include the size of the part
---

diff --git a/etc/mhshow.marker b/etc/mhshow.marker
index 4df8e383..6e324b13 100644
--- a/etc/mhshow.marker
+++ b/etc/mhshow.marker
@@ -3,5 +3,5 @@
 %; used by mhshow when it decides to not display content.
 %;
 [ part %{part} - %{content-type} - %<{description}\
-%{description}%?{cdispo-filename}%{cdispo-filename}%|%{ctype-name}%> \
-%<(unseen)\(suppressed\)%> ]
+%{description}%?{cdispo-filename}%{cdispo-filename}%|%{ctype-name}%>  \
+%(units(size))B %<(unseen)\(suppressed\)%> ]
diff --git a/uip/conflict b/uip/conflict
new file mode 100755
index 00000000..dbfb2fa5
Binary files /dev/null and b/uip/conflict differ
diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 679d8be5..ce82d70c 100644
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -1222,9 +1222,11 @@ convert_content_charset (CT ct, char **file) {
  * Compile our format string and save any parameters we care about.
  */
 
-#define DEFAULT_MARKER "[ part %{part} - %{content-type} - %<{description}" \
-		       "%{description}%?{cdispo-filename}%{cdispo-filename}" \
-		       "%|%{ctype-name}%> %<(unseen)\\(suppressed\\)%> ]"
+#define DEFAULT_MARKER "[ part %{part} - %{content-type} - " \
+		       "%<{description}%{description}" \
+		         "%?{cdispo-filename}%{cdispo-filename}" \
+		         "%|%{ctype-name}%>  " \
+		       "%(units(size))B %<(unseen)\\(suppressed\\)%> ]"
 
 static struct format *
 compile_marker(char *markerform)
diff --git a/uip/mhtest b/uip/mhtest
new file mode 100755
index 00000000..26ac2935
Binary files /dev/null and b/uip/mhtest differ
diff --git a/uip/msh b/uip/msh
new file mode 100755
index 00000000..76486746
Binary files /dev/null and b/uip/msh differ