Remove the #ifdef UK for the default scan format

Remove the #ifdef UK that lets you select an alternate default
scan format; this is left over from old mhconfig program.

diff --git a/etc/scan.default b/etc/scan.default
index 8a6ed74..0397900 100644 (file)
--- a/etc/scan.default
+++ b/etc/scan.default
@@ -1,8 +1,8 @@
 %; scan.default
 %;
 %; This file is supplied for reference only; it shows the default
 %; scan.default
 %;
 %; 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.
+%; format string which was compiled into the command "scan".  See
+%; the source file "h/scansbr.h" for details.

 %;
 %4(msg)%<(cur)+%| %>%<{replied}-%| %>\
 %02(mon{date})/%02(mday{date})%<{date} %|*%>\
 %;
 %4(msg)%<(cur)+%| %>%<{replied}-%| %>\
 %02(mon{date})/%02(mday{date})%<{date} %|*%>\

diff --git a/etc/scan.nomime b/etc/scan.nomime
index 4966228..fb3f592 100644 (file)
--- a/etc/scan.nomime
+++ b/etc/scan.nomime
@@ -1,8 +1,7 @@
 %; scan.nomime
 %;
 %; scan.nomime
 %;

-%; This file is a modification of the standard (non-UK version)
-%; format for scan, that doesn't do any RFC-2047 decoding of
-%; header components.
+%; This file is a modification of the standard format for scan,
+%; that doesn't do any RFC-2047 decoding of header components.

 %;
 %4(msg)%<(cur)+%| %>%<{replied}-%| %>\
 %02(mon{date})/%02(mday{date})%<{date} %|*%>\
 %;
 %4(msg)%<(cur)+%| %>%<{replied}-%| %>\
 %02(mon{date})/%02(mday{date})%<{date} %|*%>\

diff --git a/uip/scansbr.h b/uip/scansbr.h
index cb2c060..ede7705 100644 (file)
--- a/uip/scansbr.h
+++ b/uip/scansbr.h
@@ -14,21 +14,12 @@
  * default format for `scan' and `inc'
  */
 
  * default format for `scan' and `inc'
  */
 

-#ifndef        UK

 #define        FORMAT  \
 "%4(msg)%<(cur)+%| %>%<{replied}-%| %>\
 %02(mon{date})/%02(mday{date})%<{date} %|*%>\
 %<(mymbox{from})%<{to}To:%14(decode(friendly{to}))%>%>\
 %<(zero)%17(decode(friendly{from}))%>  \
 %(decode{subject})%<{body}<<%{body}>>%>\n"
 #define        FORMAT  \
 "%4(msg)%<(cur)+%| %>%<{replied}-%| %>\
 %02(mon{date})/%02(mday{date})%<{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}-%| %>\
-%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

 
 #define        WIDTH  78
 
 
 #define        WIDTH  78