From 3f244f6cd3f50859a165694ed06da625bf82aab7 Mon Sep 17 00:00:00 2001
From: Larry Masinter <lmm@acm.org>
Date: Mon, 10 Oct 2022 22:29:21 -0700
Subject: [PATCH] Change SYSTEM-EXTERNALFORMAT to more accurately guess the
 external format (#987)

---
 sources/EXTERNALFORMAT      |  36 ++++++++++++++++++------------------
 sources/EXTERNALFORMAT.LCOM | Bin 10998 -> 11055 bytes
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/sources/EXTERNALFORMAT b/sources/EXTERNALFORMAT
index 31e7f803..6a9fea11 100644
--- a/sources/EXTERNALFORMAT
+++ b/sources/EXTERNALFORMAT
@@ -1,13 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "24-Jul-2022 14:56:07" 
-{DSK}<users>kaplan>local>medley3.5>working-medley>sources>EXTERNALFORMAT.;75
 37244  
+
(FILECREATED "10-Oct-2022 18:10:56" 
+{DSK}<cygdrive>c>Users>Larry>home>MEDLEY>SOURCES>EXTERNALFORMAT.;76
 37395  
 
-      :CHANGES-TO (MACROS \CHECKEOLC)
-                  (FNS \INCCODE.EOLC)
+      :CHANGES-TO (FNS SYSTEM-EXTERNALFORMAT)
 
-      :PREVIOUS-DATE "24-Jul-2022 08:30:32" 
-{DSK}<users>kaplan>local>medley3.5>working-medley>sources>EXTERNALFORMAT.;72)
+      :PREVIOUS-DATE "24-Jul-2022 14:56:07" 
+{DSK}<cygdrive>c>Users>Larry>home>MEDLEY>SOURCES>EXTERNALFORMAT.;75)
 
 
 (PRETTYCOMPRINT EXTERNALFORMATCOMS)
@@ -293,9 +292,10 @@
 (DEFINEQ
 
 (SYSTEM-EXTERNALFORMAT

-  [LAMBDA NIL
                                                (* ; "Edited  7-Jul-2022 10:41 by rmk")

-    (AND (STRPOS ".UTF-8" (UNIX-GETENV "LANG"))
-         :UTF-8])
+  [LAMBDA NIL
                                                (* ; "Edited 10-Oct-2022 11:55 by lmm")


+                                                             (* ; "Edited  7-Jul-2022 10:41 by rmk")

+    (FOR
 X IN
 '("LC_CTYPE" "LC_ALL" "LANG") WHEN
 (STRPOS ".UTF-8" (UNIX-GETENV X))
+       DO
 (RETURN :UTF-8) FINALLY
 (RETURN :THROUGH])
 )
 (DECLARE%: DOEVAL@COMPILE DONTCOPY
 
@@ -712,13 +712,13 @@
 (\CREATE.THROUGH.EXTERNALFORMAT
)
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (6607 13242 (\EXTERNALFORMAT 6617 . 10395) (MAKE-EXTERNALFORMAT 10397 . 12769) (
-\EXTERNALFORMAT.DEFPRINT 12771 . 13240)) (13243 16284 (\INSTALL.EXTERNALFORMAT 13253 . 14702) (
-\REMOVE.EXTERNALFORMAT 14704 . 15535) (FIND-FORMAT 15537 . 16282)) (16285 16498 (SYSTEM-EXTERNALFORMAT
- 16295 . 16496)) (16847 31667 (\OUTCHAR 16857 . 18074) (\INCCODE 18076 . 19229) (\BACKCCODE 19231 . 
-20800) (\BACKCCODE.EOLC 20802 . 22992) (\PEEKCCODE 22994 . 23319) (\PEEKCCODE.EOLC 23321 . 23700) (
-\INCCODE.EOLC 23702 . 25501) (\FORMATBYTESTREAM 25503 . 27638) (\FORMATBYTESTRING 27640 . 29099) (
-\CHECKEOLC.CRLF 29101 . 31665)) (32945 35181 (\NULLDEVICE 32955 . 34857) (\NULL.OPENFILE 34859 . 35179
-)) (35321 37148 (\CREATE.THROUGH.EXTERNALFORMAT 35331 . 36117) (\THROUGHIN 36119 . 36539) (
-\THROUGHBACKCCODE 36541 . 36808) (\THROUGHOUTCHARFN 36810 . 37146)))))
+  (FILEMAP (NIL (6559 13194 (\EXTERNALFORMAT 6569 . 10347) (MAKE-EXTERNALFORMAT 10349 . 12721) (
+\EXTERNALFORMAT.DEFPRINT 12723 . 13192)) (13195 16236 (\INSTALL.EXTERNALFORMAT 13205 . 14654) (
+\REMOVE.EXTERNALFORMAT 14656 . 15487) (FIND-FORMAT 15489 . 16234)) (16237 16649 (SYSTEM-EXTERNALFORMAT
+ 16247 . 16647)) (16998 31818 (\OUTCHAR 17008 . 18225) (\INCCODE 18227 . 19380) (\BACKCCODE 19382 . 
+20951) (\BACKCCODE.EOLC 20953 . 23143) (\PEEKCCODE 23145 . 23470) (\PEEKCCODE.EOLC 23472 . 23851) (
+\INCCODE.EOLC 23853 . 25652) (\FORMATBYTESTREAM 25654 . 27789) (\FORMATBYTESTRING 27791 . 29250) (
+\CHECKEOLC.CRLF 29252 . 31816)) (33096 35332 (\NULLDEVICE 33106 . 35008) (\NULL.OPENFILE 35010 . 35330
+)) (35472 37299 (\CREATE.THROUGH.EXTERNALFORMAT 35482 . 36268) (\THROUGHIN 36270 . 36690) (
+\THROUGHBACKCCODE 36692 . 36959) (\THROUGHOUTCHARFN 36961 . 37297)))))
 STOP
diff --git a/sources/EXTERNALFORMAT.LCOM b/sources/EXTERNALFORMAT.LCOM
index b131da2fba8b1d78cd13e6b18b9010dfd6f32754..6c05875e311431ea9ccecf6c21eb7665cf575c47 100644
GIT binary patch
delta 670
zcmbVJO^ee|6wTC)6I?hTf*ZX&5RyegKAZZKKuBMjYMPY1mrjZcscGmGGZRT#p@{S^
z=)&KjFu3ryxbauG_GNTYKUTB2k8|(ko_o%HKeA7=_osJsO-YK4VrYf|`T*-1ww({J
z?(K`+YT2ycly2c>ZP~PLv}l^0dsd&9?t}~@GIwc`r9Po9$r(vwFA9=$;xYBH)0Y8(
z^9QeGVZ%fqzHG{(K7YNg$|V$Mi;Gp+KEy!hl#z*YK(yyfu)Y9vT2_3ZgiQ^>wyMeo
z+Fe_3H*mN>RaFGb#fFoLe{Z%eYz~ktO2IfHeo8z>hJgNKyU*pl9nxp-o^bE`>zfDD
zF(280{m_d?geoinDTpbE|GMNRWx&&v%*IJZl_A##$gq^B+pPNiB^I{(SaS}wU0a%c
znfIO_@1-f|kjo(GJwXs^9>U4VQF!Ca%~gkQAAP;5jgPxb?4FOm8euR0{7sNd8z@Vs
z2?bMwEFR~|h%ge*_>C<caK-{<0D2!V3)3VUg}e@i1xUT>pa)=qgd+ci&*oEtpo3l%
Pb$}lX$(MI;eZT(`gW|Jg

delta 567
zcmb_Zu};EJ6a^PUb#QRdLA`m22@GxOYe9IL#^&(~NNG)5&=?kk1_^~?3sGZ?zo23F
z7aZ_|oc#a?Cm))qgQIsi_v9q^-kfuv8gKRc<5jGRhm%0WGRCl@l5CF1`G@}c-6Zy-
zSnIb&L2IZ5VY?M*1HTja*NT+YF2ktb8+OGnMT^5p)b?YIop{W#bkne%n(j$^yV(pN
zto$6n3XxTURRqFW<hR4Ys2BJh@UKQuyiH&jj?ej8=nX+fM%^^w_pl^M2s*7XANXr&
z0cC`=Q85{HnC`LS^gX%tPcA^&#i|N~mUXMdT+y>3UDK&!y8<+6nb9h<O`3tUVY$$(
zSd`jDCUGrEr?1J)Q#nr*nJAdszA3uZ+x>qD7iWa#^l@ozcCm1fYFiZ(5*rC#;Wwn_
zOqj#-Vt3wF66u`+xSn%lyZqZww<;%MiFwRw@bGXBNZm8UJm*jVWOBC%R6x?Fie~om
G%jO3P?V(}-