From 3ca4495c76c2074d071b3cfe78bc0eede92c6879 Mon Sep 17 00:00:00 2001
From: Matt Heffron <heffron@alumni.caltech.edu>
Date: Tue, 6 Feb 2024 21:31:30 -0800
Subject: [PATCH] Added NONE in addition to NEVER as
 DEFAULTDATABASECOPYRIGHTOWNER to preset to (NONE).

The change from USEDFREE to SPECVARS may be irrelevant.
I thought that was the issue when using NONE as DEFAULTDATABASECOPYRIGHTOWNER didn't do as expected.
The DEFAULTCOPYRIGHTOWNER must be one of the "real" entry keys on COPYRIGHTOWNERS.
---
 library/DATABASEFNS      |  12 ++++++------
 library/DATABASEFNS.LCOM | Bin 7218 -> 7350 bytes
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/library/DATABASEFNS b/library/DATABASEFNS
index 436c18d7..7b5afabc 100644
--- a/library/DATABASEFNS
+++ b/library/DATABASEFNS
@@ -1,6 +1,6 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED " 6-Feb-2024 20:46:33" {DSK}<mnt>e>Interlisp>medley>library>DATABASEFNS.;4
 16903  
+
(FILECREATED " 6-Feb-2024 21:23:34" {DSK}<mnt>e>Interlisp>medley>library>DATABASEFNS.;6
 16912  
 
       :EDIT-BY "mth"
 
@@ -165,7 +165,7 @@ Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation.
 (DEFINEQ
 
 (DUMPDB

-  [LAMBDA (FILE PROPFLG)
                                     (* ; "Edited  6-Feb-2024 20:46 by mth")


+  [LAMBDA (FILE PROPFLG)
                                     (* ; "Edited  6-Feb-2024 21:23 by mth")


                                                            (* ; "Edited 27-Oct-2021 10:51 by larry")


                                                             (* ; "Edited 24-Oct-2021 16:24 by rmk:")

 
@@ -174,7 +174,7 @@ Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation.
     (* ;; "The FILE check is because MAKEFILE returns a list when it doesn't understand the options")

 
     (DECLARE
 (GLOBALVARS MSFILETABLE SAVEDBFLG)
-           (USEDFREE DEFAULTDATABASECOPYRIGHTOWNER COPYRIGHTFLG DEFAULTCOPYRIGHTOWNER))
+           (SPECVARS DEFAULTDATABASECOPYRIGHTOWNER COPYRIGHTFLG DEFAULTCOPYRIGHTOWNER))
     (CL:WHEN (AND FILE (OR (LITATOM FILE)
                            (STRINGP FILE)))
         (PROG (DBFILE
 DBFN DBCPR (FL (NAMEFIELD FILE))
@@ -185,7 +185,7 @@ Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation.
               [COND
                  ([NULL (SETQ DBCPR (GETPROP DBFN 'COPYRIGHT]
                   (COND
-                     [(EQ DEFAULTDATABASECOPYRIGHTOWNER 'NEVER)
+                     [(MEMQ DEFAULTDATABASECOPYRIGHTOWNER '(NONE NEVER))
                       (/PUT DBFN 'COPYRIGHT (LIST 'NONE]
                      (DEFAULTDATABASECOPYRIGHTOWNER (SETQ COPYRIGHTFLG 'DEFAULT)
                             (SETQ DEFAULTCOPYRIGHTOWNER DEFAULTDATABASECOPYRIGHTOWNER]
@@ -355,6 +355,6 @@ Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation.
 (PUTPROPS DATABASEFNS COPYRIGHT ("Xerox Corporation" 1986 1990 1991 1992 1993 2024))
 (DECLARE%: DONTCOPY
   (FILEMAP (NIL (1802 6827 (DBFILE 1812 . 3457) (DBFILE1 3459 . 4969) (DBFILE2 4971 . 6193) (LOAD 6195
- . 6425) (LOADFROM 6427 . 6615) (MAKEFILE 6617 . 6825)) (6883 16302 (DUMPDB 6893 . 10337) (LOADDB 
-10339 . 15214) (MAKEDB 15216 . 16300)))))
+ . 6425) (LOADFROM 6427 . 6615) (MAKEFILE 6617 . 6825)) (6883 16311 (DUMPDB 6893 . 10346) (LOADDB 
+10348 . 15223) (MAKEDB 15225 . 16309)))))
 STOP
diff --git a/library/DATABASEFNS.LCOM b/library/DATABASEFNS.LCOM
index 1108c0863e09e9b1a067192c0ee7fccfed9f76b9..47f391307a2410a85f597bb1718b1e5bacb87299 100644
GIT binary patch
delta 1013
zcmZuwJBt%h6wYLEmyMta8bJ{~h(%JYoBNnMGmAwgn>*RyyfQOM3?eoGT@-9=HDITe
zA&rfVy<iftkcF+Z@YnbgJadyw5^;*l`ObIdJidF+%=~VB819iH%8nQxKbM*qPv7q^
z@f{eyp?d;|un3*M*6v@v7XpK(bnLF190%bbYPU|3pzq5FLZFbj9Jd7yh{;*;))O?0
ze;M=tNvfdz-rdRN>%-4e?dNdF>VLkR*Y|VyecO3E)n*HOarQ6ui>134CWX>X^YQR$
z8dOM+`9bex24-bXG3t1B<6=s@>wQ%4NAJ<RQ@XB=&g@UFDsrk4e7$|5cvnTAFM#qW
zhg-~5xX$4)>?XjOu{0=yFlzhgA_h2J*Y#~r0<W3qmPs-|)qpVyp?&<oX}eO<tVSUo
zB>_g*4OarS1hixlMghtx1SB#}mJB6prlunkVL2dHn!oK6Af{MZhMCbu4Gtsesf0u)
z8wm*!i_Wd90zBz;z+_nkgG^psF-F{ifsBE34ow^Tuw$HvkqoToFfHhGgG2%|F}CZ4
zSv(VTMd?OXfa&;J><Ab)ma;KU0e`1DG=k;;7_nf~lTq9bd;}W}u$l$(VIqA+QHwy@
z2G+w)si}h(r+BHFVQgdF+QwLZE1oSTri?>uWBq0$eae&yB?LvyvcZVZHvmesnTRkH
zb)ykNae~F(0KozLz?W$7^<n_tTDCtRILdH<I_M^>RM2ttvRg3M8dM7vV0dGl^0hoO
dCZ}a5Z_&xLTrL#=)v2gjzQi=u`LFVe-M`wy@frXC

delta 899
zcmY*WO>fgc5RD0<YC(chN(8FZQBH}F=zjTQE0E$O>ojR%8{4TGaY97U2$UWQM~K9c
z6H(3_;EqI^3IUh=5pMi}{sh)*<0N}n&6_tnGw<yWer|p0uc3Wr>{B{^B{Vjkeq2v+
z5ytPy8Ut)_L}%}`M>q2hu*u_{-96BLUDa||D*dlh?V{hOmCJAQ%6d+oi~NVF_9cmv
zd$X9I3~ui{c-ns%7i`4W459>Go^Q_&RbE{u_pdAZ=jJ_a^xOX2QauOi&G+2{Rnt->
z^8~1jO0;g}N{pJY=XWDu1f>Bozz>?POd$kLx7~K_jsVKBOp7S$)rA8T>)_k9L#Npm
ziYAs0;VANCg<Wk6ASQ=~i2T6wfiMn{2&0riEMu@`NhXlv09$eYri)|qvIu9iPGK()
z9n}z1w$u>gbaV5@Vy0nE{%)BCN}wk~Db9qtE$7>z0EXEF-`N_O1fF!gNJ=v#+wJ&S
z1!ekwilJ;-N_D8&0Z@ukgDBBKK1UW*y?Rdu1dc=yHa!;zUz$ib0dX7&H=#@h(zlV2
z^W<*Cu%HvhMyCE4XcaTEiskr~dXi`)*o4qN67{OnZU8}CDaV{Ilw)Qszz9oImK$Nr
zS23dCdaeL&LCy1fL9=lXf&4L7NR=Q}EV6QEWr5Bz2jr(`hBCI$U*0GIm34(uDX~A6
puB<4Rff6+Nv+Wd29g1-B><osd@Z#<8`J2J%@a$o6*1G%p+CSCa)}H_X