Skip to content

Commit 3569379

Browse files
authored
Revert "duplicate definition of UNINTERRUPTABLY pp macro (#395)" (#397)
This reverts commit b07d528.
1 parent 9ab24c0 commit 3569379

File tree

2 files changed

+25
-15
lines changed

2 files changed

+25
-15
lines changed

sources/AINTERRUPT

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10 FORMAT XCCS)
2-
(FILECREATED " 6-Aug-2021 08:17:31" |{DSK}<home>larry>ilisp>medley>sources>AINTERRUPT.;2| 40689
1+
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10)
2+
(FILECREATED "17-Sep-92 10:42:38" "{Pele:mv:envos}<LispCore>Sources>AINTERRUPT.;4" 41128
33

4-
|changes| |to:| (ALISTS (PRETTYPRINTMACROS UNINTERRUPTABLY))
5-
(VARS AINTERRUPTCOMS)
4+
|changes| |to:| (FNS INTCHAR GETINTERRUPT)
65

7-
|previous| |date:| "17-Sep-92 10:42:38" |{DSK}<home>larry>ilisp>medley>sources>AINTERRUPT.;1|
8-
)
6+
|previous| |date:| "28-Jun-90 18:45:07" "{Pele:mv:envos}<LispCore>Sources>AINTERRUPT.;3")
97

108

11-
; Copyright (c) 1982-1987, 1989-1990, 1992, 2021 by Venue & Xerox Corporation.
9+
; Copyright (c) 1982, 1983, 1984, 1985, 1986, 1987, 1989, 1990, 1992 by Venue & Xerox Corporation. All rights reserved.
1210

1311
(PRETTYCOMPRINT AINTERRUPTCOMS)
1412

@@ -43,7 +41,8 @@
4341
(GLOBALVARS \\CURRENTINTERRUPTS \\SYSTEMINTERRUPTS INTERRUPTMENUFONT))
4442
(DECLARE\: EVAL@COMPILE (EXPORT (ADDVARS (SYSSPECVARS \\INTERRUPTABLE))
4543
(PROP INFO UNINTERRUPTABLY)
46-
(PROP DMACRO UNINTERRUPTABLY))
44+
(PROP DMACRO UNINTERRUPTABLY)
45+
(ALISTS (PRETTYPRINTMACROS UNINTERRUPTABLY)))
4746
DONTCOPY
4847
(EXPORT (RECORDS INTERRUPTSTATE)
4948
(PROP DMACRO \\TAKEINTERRUPT))
@@ -715,6 +714,17 @@
715714
(PROGN X . Y))
716715
NIL)))
717716

717+
(ADDTOVAR PRETTYPRINTMACROS
718+
(UNINTERRUPTABLY
719+
LAMBDA (FORM)
720+
(PROG ((POS (IPLUS 4 (POSITION))))
721+
(PRIN1 "(")
722+
(PRIN2 (CAR FORM))
723+
(OR (EQ COMMENTFLG (CAAR (SETQ FORM (CDR FORM))))
724+
(TAB POS 0))
725+
(PRINTDEF FORM POS T T FNSLST)
726+
(PRIN1 ")"))))
727+
718728
(* "END EXPORTED DEFINITIONS")
719729

720730
DONTCOPY
@@ -783,12 +793,12 @@ DONTCOPY
783793
)
784794
)
785795
(PUTPROPS AINTERRUPT COPYRIGHT ("Venue & Xerox Corporation" 1982 1983 1984 1985 1986 1987 1989 1990
786-
1992 2021))
796+
1992))
787797
(DECLARE\: DONTCOPY
788-
(FILEMAP (NIL (2536 28807 (INTCHAR 2546 . 7614) (INTERRUPTCHAR 7616 . 7890) (INTERRUPTED 7892 . 15471)
789-
(LISPINTERRUPTS 15473 . 15990) (\\DOHELPINTERRUPT 15992 . 16890) (\\DOHELPINTERRUPT1 16892 . 18290) (
790-
\\DOINTERRUPTHERE 18292 . 19472) (\\PROC.FINDREALFRAME 19474 . 20278) (\\SETPRINTLEVEL 20280 . 22232)
791-
(\\SETRECLAIMMIN 22234 . 23107) (GETINTERRUPT 23109 . 24483) (CURRENTINTERRUPTS 24485 . 24695) (
792-
SETINTERRUPT 24697 . 26675) (RESET.INTERRUPTS 26677 . 28634) (INTERRUPTABLE 28636 . 28805)) (28955
793-
34939 (CONTROL-T 28965 . 34406) (\\CONTROL-T.PRINTRATIO 34408 . 34937)))))
798+
(FILEMAP (NIL (2572 28843 (INTCHAR 2582 . 7650) (INTERRUPTCHAR 7652 . 7926) (INTERRUPTED 7928 . 15507)
799+
(LISPINTERRUPTS 15509 . 16026) (\\DOHELPINTERRUPT 16028 . 16926) (\\DOHELPINTERRUPT1 16928 . 18326) (
800+
\\DOINTERRUPTHERE 18328 . 19508) (\\PROC.FINDREALFRAME 19510 . 20314) (\\SETPRINTLEVEL 20316 . 22268)
801+
(\\SETRECLAIMMIN 22270 . 23143) (GETINTERRUPT 23145 . 24519) (CURRENTINTERRUPTS 24521 . 24731) (
802+
SETINTERRUPT 24733 . 26711) (RESET.INTERRUPTS 26713 . 28670) (INTERRUPTABLE 28672 . 28841)) (28991
803+
34975 (CONTROL-T 29001 . 34442) (\\CONTROL-T.PRINTRATIO 34444 . 34973)))))
794804
STOP

sources/AINTERRUPT.LCOM

196 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)