From 9070b11ecb51878b180a5d4b9d1aef579ced37a3 Mon Sep 17 00:00:00 2001 From: Larry Masinter Date: Fri, 6 Aug 2021 08:24:23 -0700 Subject: [PATCH] duplicate definition of UNINTERRUPTABLY pp macro --- sources/AINTERRUPT | 40 +++++++++++++++------------------------- sources/AINTERRUPT.LCOM | Bin 11671 -> 11475 bytes 2 files changed, 15 insertions(+), 25 deletions(-) diff --git a/sources/AINTERRUPT b/sources/AINTERRUPT index 89659525b..18be3b9e3 100644 --- a/sources/AINTERRUPT +++ b/sources/AINTERRUPT @@ -1,12 +1,14 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10) -(FILECREATED "17-Sep-92 10:42:38" "{Pele:mv:envos}Sources>AINTERRUPT.;4" 41128 +(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10 FORMAT XCCS) +(FILECREATED " 6-Aug-2021 08:17:31" |{DSK}larry>ilisp>medley>sources>AINTERRUPT.;2| 40689 - |changes| |to:| (FNS INTCHAR GETINTERRUPT) + |changes| |to:| (ALISTS (PRETTYPRINTMACROS UNINTERRUPTABLY)) + (VARS AINTERRUPTCOMS) - |previous| |date:| "28-Jun-90 18:45:07" "{Pele:mv:envos}Sources>AINTERRUPT.;3") + |previous| |date:| "17-Sep-92 10:42:38" |{DSK}larry>ilisp>medley>sources>AINTERRUPT.;1| +) -; Copyright (c) 1982, 1983, 1984, 1985, 1986, 1987, 1989, 1990, 1992 by Venue & Xerox Corporation. All rights reserved. +; Copyright (c) 1982-1987, 1989-1990, 1992, 2021 by Venue & Xerox Corporation. (PRETTYCOMPRINT AINTERRUPTCOMS) @@ -41,8 +43,7 @@ (GLOBALVARS \\CURRENTINTERRUPTS \\SYSTEMINTERRUPTS INTERRUPTMENUFONT)) (DECLARE\: EVAL@COMPILE (EXPORT (ADDVARS (SYSSPECVARS \\INTERRUPTABLE)) (PROP INFO UNINTERRUPTABLY) - (PROP DMACRO UNINTERRUPTABLY) - (ALISTS (PRETTYPRINTMACROS UNINTERRUPTABLY))) + (PROP DMACRO UNINTERRUPTABLY)) DONTCOPY (EXPORT (RECORDS INTERRUPTSTATE) (PROP DMACRO \\TAKEINTERRUPT)) @@ -714,17 +715,6 @@ (PROGN X . Y)) NIL))) -(ADDTOVAR PRETTYPRINTMACROS - (UNINTERRUPTABLY - LAMBDA (FORM) - (PROG ((POS (IPLUS 4 (POSITION)))) - (PRIN1 "(") - (PRIN2 (CAR FORM)) - (OR (EQ COMMENTFLG (CAAR (SETQ FORM (CDR FORM)))) - (TAB POS 0)) - (PRINTDEF FORM POS T T FNSLST) - (PRIN1 ")")))) - (* "END EXPORTED DEFINITIONS") DONTCOPY @@ -793,12 +783,12 @@ DONTCOPY ) ) (PUTPROPS AINTERRUPT COPYRIGHT ("Venue & Xerox Corporation" 1982 1983 1984 1985 1986 1987 1989 1990 -1992)) +1992 2021)) (DECLARE\: DONTCOPY - (FILEMAP (NIL (2572 28843 (INTCHAR 2582 . 7650) (INTERRUPTCHAR 7652 . 7926) (INTERRUPTED 7928 . 15507) - (LISPINTERRUPTS 15509 . 16026) (\\DOHELPINTERRUPT 16028 . 16926) (\\DOHELPINTERRUPT1 16928 . 18326) ( -\\DOINTERRUPTHERE 18328 . 19508) (\\PROC.FINDREALFRAME 19510 . 20314) (\\SETPRINTLEVEL 20316 . 22268) -(\\SETRECLAIMMIN 22270 . 23143) (GETINTERRUPT 23145 . 24519) (CURRENTINTERRUPTS 24521 . 24731) ( -SETINTERRUPT 24733 . 26711) (RESET.INTERRUPTS 26713 . 28670) (INTERRUPTABLE 28672 . 28841)) (28991 -34975 (CONTROL-T 29001 . 34442) (\\CONTROL-T.PRINTRATIO 34444 . 34973))))) + (FILEMAP (NIL (2536 28807 (INTCHAR 2546 . 7614) (INTERRUPTCHAR 7616 . 7890) (INTERRUPTED 7892 . 15471) + (LISPINTERRUPTS 15473 . 15990) (\\DOHELPINTERRUPT 15992 . 16890) (\\DOHELPINTERRUPT1 16892 . 18290) ( +\\DOINTERRUPTHERE 18292 . 19472) (\\PROC.FINDREALFRAME 19474 . 20278) (\\SETPRINTLEVEL 20280 . 22232) +(\\SETRECLAIMMIN 22234 . 23107) (GETINTERRUPT 23109 . 24483) (CURRENTINTERRUPTS 24485 . 24695) ( +SETINTERRUPT 24697 . 26675) (RESET.INTERRUPTS 26677 . 28634) (INTERRUPTABLE 28636 . 28805)) (28955 +34939 (CONTROL-T 28965 . 34406) (\\CONTROL-T.PRINTRATIO 34408 . 34937))))) STOP diff --git a/sources/AINTERRUPT.LCOM b/sources/AINTERRUPT.LCOM index b615686143eb8be84d929102e979edf79cdeccb9..da72e08b420e525cf361273e1824e3a964590e86 100644 GIT binary patch delta 1043 zcmbVL&rj1}7!CxD79^r^7!2^GFlaY7*KV*;&9rtMRQk*I8(~t>$;wzV)@2(e#G1vU z7o(QMtKN)WOgNMH7kDw=NsLz#ypeeDt-67U9<+z&d!P5m^S$qzuP>H9=AT|`p^>a+ zC_F|Zi-KU%1eKL!Q7}Xviy1_s=?K43im)-3L9rCaB)K?4B8psb)@$X8T|`b5k_h)f z#+-k6WzAW))0INKzL_pp%8goj-7Z$_&2+=rsISn{%qnBBi_T^hg^phNu z;No!-x%cXJ`vw=eD{F;n$!>5if!wOoTq{>g;4N2OL}qicjL_7fNHiLS`eLDJ7a@E! z!m=Ej;1Y52w;5Z19rC|sLW$UPY6ceat7qu5>2NNhcv&*Bi74F=G0y7-Y(n7$L-W2- zXIqF`;0+TUu1C-mlSXc>Zr?9E8x2tLCjuRUWRelnu0>{8#KgD+%f(YL@4v5~acKg2 z5axIT^>CRK;XUf1xBI%A-Ce%BRwDBdtx8t_~ zPX;x>d~g}CHXQIi1a+`RCoDjBVioZ754S< z*t$P^ClLRPFSbmBdGQYFxZC9-@J+}OVCtoXmSKcGop^?P`nfK_JaYq>ODOQ zxJw6=c9G1Rco}CTb6(Q0q=+cisreb275?Z}MSNJ`3866PI-v{kwytG$8iskqj%dfL zh-xki{nCWD6G}k!*O0%Ge3%2=3Qqv;hKG73HLD?UftMj~H+&1clab;8!OXxj^8amE Ig(}I!cP-B-4{zvgpa(X2(e#V#mumZdK}aoW)!JTF(R;H7p8Q?-D7E zqx~gSb+zYSs)7%ddI5wuz=6vi_#2S8RaI}O7ybawNLAk?BrAHuk-nZc?=x?{elvOA zetP%GElUze({XJpvQ1_;KvY-cjqXsc>rmAVRWp>2MId4?xi{($;%!KVAVT_}L2p02 zG3f7)ddXg#Rq_kRAc(c9>~;6#`U}M1<{MQ2l0JSG}%1d zz#Ni}!Duj?e5UYK5$F9gS&pnv7XVi?(swXMJlBeVjiy}~J)U0>=U_ubN6 z)PI(~Ky6x%mlXX7Qpv4P2A5 zEyf(rUJLF3vE0DA4OPB;0#EYvb2H=&Rw|SV3;#{7TReq}gv>2nLQ^}X^5PWfbgWhs z+5YLxpve7Nn!h|HX0|=sZ#4s-+kI8iu+D`tZ$w%)P=6~IQU5G2jkS<1Ub}TH5VO%> z!Do2&CI>P;4bQZqfC71|Yv7vRTEoN}8$_N2B#eS}ASC3d6S^%58cqh(VNT%l26Dvl z6}+BA{5MdsLAcqtf&|ATh=ACefQOFWS<}UWmWcqNHrpIyIMJ9c;3b*427F8G@T5L# t*v$zk@Og$m{7bo%&Gr{1adMtvi=pX|POn>*T%&V>Qm?CcT)yK9ZvaFHL&5+6