Removed special `folder' and `dtimenow' format escapes from scan listings.

[mmh] / h / scansbr.h

diff --git a/h/scansbr.h b/h/scansbr.h
index bba2b44..4e2e87a 100644 (file)
--- a/h/scansbr.h
+++ b/h/scansbr.h
@@ -4,7 +4,6 @@
 
 extern char *scanl;
 
-#define SCNENC  2     /* message just fine, but encrypted(!!) */
 #define SCNMSG  1     /* message just fine                    */
 #define SCNEOF  0     /* empty message                        */
 #define SCNERR  (-1)  /* error message                        */
@@ -14,25 +13,15 @@ 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(msg)%<(cur)+%| %>%<{replied}-%| %>\
+%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
 
 /*
 ** prototypes
 */
-int scan (FILE *, int, int, char *, int, int, int, char *, long, int);
+int scan(FILE *, int, int, char *, int, int, int, int);