From: Ken Hornstein <kenh@pobox.com>
Date: Sat, 18 May 2019 13:21:21 +0000 (-0400)
Subject: Remove the #ifdef UK for the default scan format
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/ba7b003a620923555458964d6c7fd05ebaadc836?hp=912755a7e0ad3d94d084798dd60bb7397abf3931

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 8a6ed742..0397900c 100644
--- 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
-%; 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} %|*%>\
diff --git a/etc/scan.nomime b/etc/scan.nomime
index 49662289..fb3f5925 100644
--- a/etc/scan.nomime
+++ b/etc/scan.nomime
@@ -1,8 +1,7 @@
 %; 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} %|*%>\
diff --git a/uip/scansbr.h b/uip/scansbr.h
index cb2c060e..ede77056 100644
--- a/uip/scansbr.h
+++ b/uip/scansbr.h
@@ -14,21 +14,12 @@
  * 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"
-#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