Adjusted the default scan listing: remove the body preview

The original listing is still available as etc/scan.nmh

diff --git a/etc/scan.default b/etc/scan.nmh
similarity index 53%
rename from etc/scan.default
rename to etc/scan.nmh
index f898e86..a59116c 100644 (file)
--- a/etc/scan.default
+++ b/etc/scan.nmh
@@ -1,8 +1,6 @@
-%; scan.default
+%; scan.nmh
 %;
-%; This file is supplied for reference only; it shows the default
-%; format string (for non-UK sites) which was compiled into the
-%; command "scan".  See the source file "h/scansbr.h" for details.
+%; This is nmh's default format string (for non-UK sites).
 %;
 %4(msg)%<(cur)+%| %>%<{replied}-%?{encrypted}E%| %>\
 %02(mon{date})/%02(mday{date})%<{date} %|*%>\

diff --git a/h/scansbr.h b/h/scansbr.h
index 45dd1fe..f7a8e37 100644 (file)
--- a/h/scansbr.h
+++ b/h/scansbr.h
@@ -14,21 +14,11 @@ extern char *scanl;
 /*
 ** default format for `scan' and `inc'
 */
-#ifndef UK
 # define FORMAT \
 "%4(msg)%<(cur)+%| %>%<{replied}-%?{encrypted}E%| %>\
-%02(mon{date})/%02(mday{date})%<{date} %|*%>\
+%4(year{date})-%02(mon{date})-%02(mday{date})  \
 %<(mymbox{from})%<{to}To:%14(decode(friendly{to}))%>%>\
-%<(zero)%17(decode(friendly{from}))%>  \
-%(decode{subject})%<{body}<<%{body}>>%>\n"
-#else
-# define FORMAT \
-"%4(msg)%<(cur)+%| %>%<{replied}-%?{encrypted}E%| %>\
-%02(mday{date})/%02(mon{date})%<{date} %|*%>\
-%<(mymbox{from})%<{to}To:%14(decode(friendly{to}))%>%>\
-%<(zero)%17(decode(friendly{from}))%>  \
-%(decode{subject})%<{body}<<%{body}>>%>\n"
-#endif
+%<(zero)%17(decode(friendly{from}))%>  %(decode{subject})\n"
 
 #define WIDTH  78