diff --git a/code/exports.lisp b/code/exports.lisp
index 966a0ccc6a7a544401c2a4f6956e8e1240a6f2a2..063e4176cdf1e741f2aed70273dd7cda0f5f2172 100644
--- a/code/exports.lisp
+++ b/code/exports.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/exports.lisp,v 1.91 1993/07/22 20:57:38 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/exports.lisp,v 1.92 1993/07/22 22:29:36 ram Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -174,182 +174,183 @@
 (use-package '("LISP") "NEW-ASSEM")
 
 (defpackage "XLIB"
-	    (:nicknames "OLD-XLIB")
-            (:export "*VERSION*" "ACCESS-CONTROL" "ACCESS-ERROR" "ACCESS-HOSTS"
-             "ACTIVATE-SCREEN-SAVER" "ADD-ACCESS-HOST" "ADD-RESOURCE"
-             "ADD-TO-SAVE-SET" "ALIST" "ALLOC-COLOR" "ALLOC-COLOR-CELLS"
-             "ALLOC-COLOR-PLANES" "ALLOC-ERROR" "ALLOW-EVENTS" "ANGLE"
-             "ARC-SEQ" "ARRAY-INDEX" "ATOM-ERROR" "ATOM-NAME" "BELL"
-             "BIT-GRAVITY" "BITMAP" "BITMAP-FORMAT" "BITMAP-FORMAT-LSB-FIRST-P"
-             "BITMAP-FORMAT-P" "BITMAP-FORMAT-PAD" "BITMAP-FORMAT-UNIT"
-             "BITMAP-IMAGE" "BOOLE-CONSTANT" "BOOLEAN" "CARD16" "CARD29"
-             "CARD32" "CARD8" "CARD8->CHAR" "CHANGE-ACTIVE-POINTER-GRAB"
-             "CHANGE-KEYBOARD-CONTROL" "CHANGE-KEYBOARD-MAPPING"
-             "CHANGE-POINTER-CONTROL" "CHANGE-PROPERTY" "CHAR->CARD8"
-             "CHAR-ASCENT" "CHAR-ATTRIBUTES" "CHAR-DESCENT" "CHAR-LEFT-BEARING"
-             "CHAR-RIGHT-BEARING" "CHAR-WIDTH" "CHARACTER->KEYSYMS"
-             "CHARACTER-IN-MAP-P" "CIRCULATE-WINDOW-DOWN" "CIRCULATE-WINDOW-UP"
-             "CLEAR-AREA" "CLOSE-DISPLAY" "CLOSE-DOWN-MODE" "CLOSE-FONT"
-             "CLOSED-DISPLAY" "COLOR" "COLOR-BLUE" "COLOR-GREEN" "COLOR-P"
-             "COLOR-RED" "COLOR-RGB" "COLORMAP" "COLORMAP-DISPLAY"
-             "COLORMAP-EQUAL" "COLORMAP-ERROR" "COLORMAP-ID" "COLORMAP-P"
-             "COLORMAP-PLIST" "COLORMAP-VISUAL-INFO" "CONNECTION-FAILURE"
-             "CONVERT-SELECTION" "COPY-AREA" "COPY-COLORMAP-AND-FREE"
-             "COPY-GCONTEXT" "COPY-GCONTEXT-COMPONENTS" "COPY-IMAGE"
-             "COPY-PLANE" "CREATE-COLORMAP" "CREATE-CURSOR" "CREATE-GCONTEXT"
-             "CREATE-GLYPH-CURSOR" "CREATE-IMAGE" "CREATE-PIXMAP"
-             "CREATE-WINDOW" "CURSOR" "CURSOR-DISPLAY" "CURSOR-EQUAL"
-             "CURSOR-ERROR" "CURSOR-ID" "CURSOR-P" "CURSOR-PLIST" "CUT-BUFFER"
-             "DECLARE-EVENT" "DECODE-CORE-ERROR" "DEFAULT-ERROR-HANDLER"
-             "DEFAULT-KEYSYM-INDEX" "DEFAULT-KEYSYM-TRANSLATE" "DEFINE-ERROR"
-             "DEFINE-EXTENSION" "DEFINE-GCONTEXT-ACCESSOR" "DEFINE-KEYSYM"
-             "DEFINE-KEYSYM-SET" "DELETE-PROPERTY" "DELETE-RESOURCE"
-             "DESTROY-SUBWINDOWS" "DESTROY-WINDOW" "DEVICE-BUSY"
-             "DEVICE-EVENT-MASK" "DEVICE-EVENT-MASK-CLASS"
-             "DISCARD-CURRENT-EVENT" "DISCARD-FONT-INFO" "DISPLAY"
-             "DISPLAY-AFTER-FUNCTION" "DISPLAY-AUTHORIZATION-DATA"
-             "DISPLAY-AUTHORIZATION-NAME" "DISPLAY-BITMAP-FORMAT"
-             "DISPLAY-BYTE-ORDER" "DISPLAY-DEFAULT-SCREEN" "DISPLAY-DISPLAY"
-             "DISPLAY-ERROR-HANDLER" "DISPLAY-FINISH-OUTPUT"
-             "DISPLAY-FORCE-OUTPUT" "DISPLAY-HOST" "DISPLAY-IMAGE-LSB-FIRST-P"
-             "DISPLAY-INVOKE-AFTER-FUNCTION" "DISPLAY-KEYCODE-RANGE"
-             "DISPLAY-MAX-KEYCODE" "DISPLAY-MAX-REQUEST-LENGTH"
-             "DISPLAY-MIN-KEYCODE" "DISPLAY-MOTION-BUFFER-SIZE"
-             "DISPLAY-NSCREENS" "DISPLAY-P" "DISPLAY-PIXMAP-FORMATS"
-             "DISPLAY-PLIST" "DISPLAY-PROTOCOL-MAJOR-VERSION"
-             "DISPLAY-PROTOCOL-MINOR-VERSION" "DISPLAY-PROTOCOL-VERSION"
-             "DISPLAY-RELEASE-NUMBER" "DISPLAY-REPORT-ASYNCHRONOUS-ERRORS"
-             "DISPLAY-RESOURCE-ID-BASE" "DISPLAY-RESOURCE-ID-MASK"
-             "DISPLAY-ROOTS" "DISPLAY-VENDOR" "DISPLAY-VENDOR-NAME"
-             "DISPLAY-XDEFAULTS" "DISPLAY-XID" "DRAW-ARC" "DRAW-ARCS"
-             "DRAW-DIRECTION" "DRAW-GLYPH" "DRAW-GLYPHS" "DRAW-IMAGE-GLYPH"
-             "DRAW-IMAGE-GLYPHS" "DRAW-LINE" "DRAW-LINES" "DRAW-POINT"
-             "DRAW-POINTS" "DRAW-RECTANGLE" "DRAW-RECTANGLES" "DRAW-SEGMENTS"
-             "DRAWABLE" "DRAWABLE-BORDER-WIDTH" "DRAWABLE-DEPTH"
-             "DRAWABLE-DISPLAY" "DRAWABLE-EQUAL" "DRAWABLE-ERROR"
-             "DRAWABLE-HEIGHT" "DRAWABLE-ID" "DRAWABLE-P" "DRAWABLE-PLIST"
-             "DRAWABLE-ROOT" "DRAWABLE-WIDTH" "DRAWABLE-X" "DRAWABLE-Y"
-             "ERROR-KEY" "EVENT-CASE" "EVENT-COND" "EVENT-HANDLER" "EVENT-KEY"
-             "EVENT-LISTEN" "EVENT-MASK" "EVENT-MASK-CLASS" "EXTENSION-OPCODE"
-             "FIND-ATOM" "FONT" "FONT-ALL-CHARS-EXIST-P" "FONT-ASCENT"
-             "FONT-DEFAULT-CHAR" "FONT-DESCENT" "FONT-DIRECTION" "FONT-DISPLAY"
-             "FONT-EQUAL" "FONT-ERROR" "FONT-ID" "FONT-MAX-BYTE1"
-             "FONT-MAX-BYTE2" "FONT-MAX-CHAR" "FONT-MIN-BYTE1" "FONT-MIN-BYTE2"
-             "FONT-MIN-CHAR" "FONT-NAME" "FONT-P" "FONT-PATH" "FONT-PLIST"
-             "FONT-PROPERTIES" "FONT-PROPERTY" "FONTABLE"
-             "FORCE-GCONTEXT-CHANGES" "FREE-COLORMAP" "FREE-COLORS"
-             "FREE-CURSOR" "FREE-GCONTEXT" "FREE-PIXMAP" "GCONTEXT"
-             "GCONTEXT-ARC-MODE" "GCONTEXT-BACKGROUND" "GCONTEXT-CACHE-P"
-             "GCONTEXT-CAP-STYLE" "GCONTEXT-CLIP-MASK" "GCONTEXT-CLIP-ORDERING"
-             "GCONTEXT-CLIP-X" "GCONTEXT-CLIP-Y" "GCONTEXT-DASH-OFFSET"
-             "GCONTEXT-DASHES" "GCONTEXT-DISPLAY" "GCONTEXT-EQUAL"
-             "GCONTEXT-ERROR" "GCONTEXT-EXPOSURES" "GCONTEXT-FILL-RULE"
-             "GCONTEXT-FILL-STYLE" "GCONTEXT-FONT" "GCONTEXT-FOREGROUND"
-             "GCONTEXT-FUNCTION" "GCONTEXT-ID" "GCONTEXT-JOIN-STYLE"
-             "GCONTEXT-KEY" "GCONTEXT-LINE-STYLE" "GCONTEXT-LINE-WIDTH"
-             "GCONTEXT-P" "GCONTEXT-PLANE-MASK" "GCONTEXT-PLIST"
-             "GCONTEXT-STIPPLE" "GCONTEXT-SUBWINDOW-MODE" "GCONTEXT-TILE"
-             "GCONTEXT-TS-X" "GCONTEXT-TS-Y" "GET-EXTERNAL-EVENT-CODE"
-             "GET-IMAGE" "GET-PROPERTY" "GET-RAW-IMAGE" "GET-RESOURCE"
-             "GET-SEARCH-RESOURCE" "GET-SEARCH-TABLE" "GET-STANDARD-COLORMAP"
-             "GET-WM-CLASS" "GLOBAL-POINTER-POSITION" "GRAB-BUTTON" "GRAB-KEY"
-             "GRAB-KEYBOARD" "GRAB-POINTER" "GRAB-SERVER" "GRAB-STATUS"
-             "ICON-SIZES" "ICONIFY-WINDOW" "ID-CHOICE-ERROR"
-             "ILLEGAL-REQUEST-ERROR" "IMAGE" "IMAGE-BLUE-MASK" "IMAGE-DEPTH"
-             "IMAGE-GREEN-MASK" "IMAGE-HEIGHT" "IMAGE-NAME" "IMAGE-PIXMAP"
-             "IMAGE-PLIST" "IMAGE-RED-MASK" "IMAGE-WIDTH" "IMAGE-X"
-             "IMAGE-X-HOT" "IMAGE-X-P" "IMAGE-XY" "IMAGE-XY-BITMAP-LIST"
-             "IMAGE-XY-P" "IMAGE-Y-HOT" "IMAGE-Z" "IMAGE-Z-BITS-PER-PIXEL"
-             "IMAGE-Z-P" "IMAGE-Z-PIXARRAY" "IMPLEMENTATION-ERROR"
-             "INPUT-FOCUS" "INSTALL-COLORMAP" "INSTALLED-COLORMAPS" "INT16"
-             "INT32" "INT8" "INTERN-ATOM" "INVALID-FONT" "KEYBOARD-CONTROL"
-             "KEYBOARD-MAPPING" "KEYCODE->CHARACTER" "KEYCODE->KEYSYM" "KEYSYM"
-             "KEYSYM->CHARACTER" "KEYSYM->KEYCODES" "KEYSYM-IN-MAP-P"
-             "KEYSYM-SET" "KILL-CLIENT" "KILL-TEMPORARY-CLIENTS" "LENGTH-ERROR"
-             "LIST-EXTENSIONS" "LIST-FONT-NAMES" "LIST-FONTS" "LIST-PROPERTIES"
-             "LOAD-CLX" "LOOKUP-COLOR" "LOOKUP-ERROR" "MAKE-COLOR"
-             "MAKE-EVENT-HANDLERS" "MAKE-EVENT-KEYS" "MAKE-EVENT-MASK"
-             "MAKE-RESOURCE-DATABASE" "MAKE-STATE-KEYS" "MAKE-STATE-MASK"
-             "MAKE-WM-HINTS" "MAKE-WM-SIZE-HINTS" "MAP-RESOURCE"
-             "MAP-SUBWINDOWS" "MAP-WINDOW" "MAPPING-NOTIFY" "MASK16" "MASK32"
-             "MATCH-ERROR" "MAX-CHAR-ASCENT" "MAX-CHAR-ATTRIBUTES"
-             "MAX-CHAR-DESCENT" "MAX-CHAR-LEFT-BEARING"
-             "MAX-CHAR-RIGHT-BEARING" "MAX-CHAR-WIDTH" "MERGE-RESOURCES"
-             "MIN-CHAR-ASCENT" "MIN-CHAR-ATTRIBUTES" "MIN-CHAR-DESCENT"
-             "MIN-CHAR-LEFT-BEARING" "MIN-CHAR-RIGHT-BEARING" "MIN-CHAR-WIDTH"
-             "MISSING-PARAMETER" "MODIFIER-KEY" "MODIFIER-MAPPING"
-             "MODIFIER-MASK" "MOTION-EVENTS" "NAME-ERROR" "NO-OPERATION"
-             "OPEN-DISPLAY" "OPEN-FONT" "PIXARRAY" "PIXEL" "PIXMAP"
-             "PIXMAP-DISPLAY" "PIXMAP-EQUAL" "PIXMAP-ERROR" "PIXMAP-FORMAT"
-             "PIXMAP-FORMAT-BITS-PER-PIXEL" "PIXMAP-FORMAT-DEPTH"
-             "PIXMAP-FORMAT-P" "PIXMAP-FORMAT-SCANLINE-PAD" "PIXMAP-ID"
-             "PIXMAP-P" "PIXMAP-PLIST" "POINT-SEQ" "POINTER-CONTROL"
-             "POINTER-EVENT-MASK" "POINTER-EVENT-MASK-CLASS" "POINTER-MAPPING"
-             "POINTER-POSITION" "PROCESS-EVENT" "PUT-IMAGE" "PUT-RAW-IMAGE"
-             "QUERY-BEST-CURSOR" "QUERY-BEST-STIPPLE" "QUERY-BEST-TILE"
-             "QUERY-COLORS" "QUERY-EXTENSION" "QUERY-KEYMAP" "QUERY-POINTER"
-             "QUERY-TREE" "QUEUE-EVENT" "READ-BITMAP-FILE" "READ-RESOURCES"
-             "RECOLOR-CURSOR" "RECT-SEQ" "REMOVE-ACCESS-HOST"
-             "REMOVE-FROM-SAVE-SET" "REPARENT-WINDOW" "REPEAT-SEQ"
-             "REPLY-LENGTH-ERROR" "REPLY-TIMEOUT" "REQUEST-ERROR"
-             "RESET-SCREEN-SAVER" "RESOURCE-DATABASE"
-             "RESOURCE-DATABASE-TIMESTAMP" "RESOURCE-ERROR" "RESOURCE-ID"
-             "RESOURCE-KEY" "RGB-COLORMAPS" "RGB-VAL" "ROOT-RESOURCES"
-             "ROTATE-CUT-BUFFERS" "ROTATE-PROPERTIES" "SCREEN"
-             "SCREEN-BACKING-STORES" "SCREEN-BLACK-PIXEL"
-             "SCREEN-DEFAULT-COLORMAP" "SCREEN-DEPTHS"
-             "SCREEN-EVENT-MASK-AT-OPEN" "SCREEN-HEIGHT"
-             "SCREEN-HEIGHT-IN-MILLIMETERS" "SCREEN-MAX-INSTALLED-MAPS"
-             "SCREEN-MIN-INSTALLED-MAPS" "SCREEN-P" "SCREEN-PLIST"
-             "SCREEN-ROOT" "SCREEN-ROOT-DEPTH" "SCREEN-ROOT-VISUAL"
-             "SCREEN-ROOT-VISUAL-INFO" "SCREEN-SAVE-UNDERS-P" "SCREEN-SAVER"
-             "SCREEN-WHITE-PIXEL" "SCREEN-WIDTH" "SCREEN-WIDTH-IN-MILLIMETERS"
-             "SEG-SEQ" "SELECTION-OWNER" "SEND-EVENT" "SEQUENCE-ERROR"
-             "SET-ACCESS-CONTROL" "SET-CLOSE-DOWN-MODE" "SET-INPUT-FOCUS"
-             "SET-MODIFIER-MAPPING" "SET-POINTER-MAPPING" "SET-SCREEN-SAVER"
-             "SET-SELECTION-OWNER" "SET-STANDARD-COLORMAP"
-             "SET-STANDARD-PROPERTIES" "SET-WM-CLASS" "SET-WM-PROPERTIES"
-             "SET-WM-RESOURCES" "STATE-KEYSYM-P" "STATE-MASK-KEY" "STORE-COLOR"
-             "STORE-COLORS" "STRINGABLE" "TEXT-EXTENTS" "TEXT-WIDTH"
-             "TIMESTAMP" "TRANSIENT-FOR" "TRANSLATE-COORDINATES"
-             "TRANSLATE-DEFAULT" "TRANSLATION-FUNCTION" "TYPE-ERROR"
-             "UNDEFINE-KEYSYM" "UNEXPECTED-REPLY" "UNGRAB-BUTTON" "UNGRAB-KEY"
-             "UNGRAB-KEYBOARD" "UNGRAB-POINTER" "UNGRAB-SERVER"
-             "UNINSTALL-COLORMAP" "UNKNOWN-ERROR" "UNMAP-SUBWINDOWS"
-             "UNMAP-WINDOW" "VALUE-ERROR" "VISUAL-INFO"
-             "VISUAL-INFO-BITS-PER-RGB" "VISUAL-INFO-BLUE-MASK"
-             "VISUAL-INFO-CLASS" "VISUAL-INFO-COLORMAP-ENTRIES"
-             "VISUAL-INFO-DISPLAY" "VISUAL-INFO-GREEN-MASK" "VISUAL-INFO-ID"
-             "VISUAL-INFO-P" "VISUAL-INFO-PLIST" "VISUAL-INFO-RED-MASK"
-             "WARP-POINTER" "WARP-POINTER-IF-INSIDE" "WARP-POINTER-RELATIVE"
-             "WARP-POINTER-RELATIVE-IF-INSIDE" "WIN-GRAVITY" "WINDOW"
-             "WINDOW-ALL-EVENT-MASKS" "WINDOW-BACKGROUND"
-             "WINDOW-BACKING-PIXEL" "WINDOW-BACKING-PLANES"
-             "WINDOW-BACKING-STORE" "WINDOW-BIT-GRAVITY" "WINDOW-BORDER"
-             "WINDOW-CLASS" "WINDOW-COLORMAP" "WINDOW-COLORMAP-INSTALLED-P"
-             "WINDOW-CURSOR" "WINDOW-DISPLAY" "WINDOW-DO-NOT-PROPAGATE-MASK"
-             "WINDOW-EQUAL" "WINDOW-ERROR" "WINDOW-EVENT-MASK" "WINDOW-GRAVITY"
-             "WINDOW-ID" "WINDOW-MAP-STATE" "WINDOW-OVERRIDE-REDIRECT"
-             "WINDOW-P" "WINDOW-PLIST" "WINDOW-PRIORITY" "WINDOW-SAVE-UNDER"
-             "WINDOW-VISUAL" "WINDOW-VISUAL-INFO" "WITH-DISPLAY"
-             "WITH-EVENT-QUEUE" "WITH-GCONTEXT" "WITH-SERVER-GRABBED"
-             "WITH-STATE" "WITHDRAW-WINDOW" "WM-CLIENT-MACHINE"
-             "WM-COLORMAP-WINDOWS" "WM-COMMAND" "WM-HINTS" "WM-HINTS-FLAGS"
-             "WM-HINTS-ICON-MASK" "WM-HINTS-ICON-PIXMAP" "WM-HINTS-ICON-WINDOW"
-             "WM-HINTS-ICON-X" "WM-HINTS-ICON-Y" "WM-HINTS-INITIAL-STATE"
-             "WM-HINTS-INPUT" "WM-HINTS-P" "WM-HINTS-WINDOW-GROUP"
-             "WM-ICON-NAME" "WM-NAME" "WM-NORMAL-HINTS" "WM-PROTOCOLS"
-             "WM-RESOURCES" "WM-SIZE-HINTS" "WM-SIZE-HINTS-BASE-HEIGHT"
-             "WM-SIZE-HINTS-BASE-WIDTH" "WM-SIZE-HINTS-HEIGHT"
-             "WM-SIZE-HINTS-HEIGHT-INC" "WM-SIZE-HINTS-MAX-ASPECT"
-             "WM-SIZE-HINTS-MAX-HEIGHT" "WM-SIZE-HINTS-MAX-WIDTH"
-             "WM-SIZE-HINTS-MIN-ASPECT" "WM-SIZE-HINTS-MIN-HEIGHT"
-             "WM-SIZE-HINTS-MIN-WIDTH" "WM-SIZE-HINTS-P"
-             "WM-SIZE-HINTS-USER-SPECIFIED-POSITION-P"
-             "WM-SIZE-HINTS-USER-SPECIFIED-SIZE-P" "WM-SIZE-HINTS-WIDTH"
-             "WM-SIZE-HINTS-WIDTH-INC" "WM-SIZE-HINTS-WIN-GRAVITY"
-             "WM-SIZE-HINTS-X" "WM-SIZE-HINTS-Y" "WM-ZOOM-HINTS"
-             "WRITE-BITMAP-FILE" "WRITE-RESOURCES" "XATOM"))
+  (:nicknames "OLD-XLIB")
+  (:shadow "DEFINE-CONDITION")
+  (:export "*VERSION*" "ACCESS-CONTROL" "ACCESS-ERROR" "ACCESS-HOSTS"
+	   "ACTIVATE-SCREEN-SAVER" "ADD-ACCESS-HOST" "ADD-RESOURCE"
+	   "ADD-TO-SAVE-SET" "ALIST" "ALLOC-COLOR" "ALLOC-COLOR-CELLS"
+	   "ALLOC-COLOR-PLANES" "ALLOC-ERROR" "ALLOW-EVENTS" "ANGLE"
+	   "ARC-SEQ" "ARRAY-INDEX" "ATOM-ERROR" "ATOM-NAME" "BELL"
+	   "BIT-GRAVITY" "BITMAP" "BITMAP-FORMAT" "BITMAP-FORMAT-LSB-FIRST-P"
+	   "BITMAP-FORMAT-P" "BITMAP-FORMAT-PAD" "BITMAP-FORMAT-UNIT"
+	   "BITMAP-IMAGE" "BOOLE-CONSTANT" "BOOLEAN" "CARD16" "CARD29"
+	   "CARD32" "CARD8" "CARD8->CHAR" "CHANGE-ACTIVE-POINTER-GRAB"
+	   "CHANGE-KEYBOARD-CONTROL" "CHANGE-KEYBOARD-MAPPING"
+	   "CHANGE-POINTER-CONTROL" "CHANGE-PROPERTY" "CHAR->CARD8"
+	   "CHAR-ASCENT" "CHAR-ATTRIBUTES" "CHAR-DESCENT" "CHAR-LEFT-BEARING"
+	   "CHAR-RIGHT-BEARING" "CHAR-WIDTH" "CHARACTER->KEYSYMS"
+	   "CHARACTER-IN-MAP-P" "CIRCULATE-WINDOW-DOWN" "CIRCULATE-WINDOW-UP"
+	   "CLEAR-AREA" "CLOSE-DISPLAY" "CLOSE-DOWN-MODE" "CLOSE-FONT"
+	   "CLOSED-DISPLAY" "COLOR" "COLOR-BLUE" "COLOR-GREEN" "COLOR-P"
+	   "COLOR-RED" "COLOR-RGB" "COLORMAP" "COLORMAP-DISPLAY"
+	   "COLORMAP-EQUAL" "COLORMAP-ERROR" "COLORMAP-ID" "COLORMAP-P"
+	   "COLORMAP-PLIST" "COLORMAP-VISUAL-INFO" "CONNECTION-FAILURE"
+	   "CONVERT-SELECTION" "COPY-AREA" "COPY-COLORMAP-AND-FREE"
+	   "COPY-GCONTEXT" "COPY-GCONTEXT-COMPONENTS" "COPY-IMAGE"
+	   "COPY-PLANE" "CREATE-COLORMAP" "CREATE-CURSOR" "CREATE-GCONTEXT"
+	   "CREATE-GLYPH-CURSOR" "CREATE-IMAGE" "CREATE-PIXMAP"
+	   "CREATE-WINDOW" "CURSOR" "CURSOR-DISPLAY" "CURSOR-EQUAL"
+	   "CURSOR-ERROR" "CURSOR-ID" "CURSOR-P" "CURSOR-PLIST" "CUT-BUFFER"
+	   "DECLARE-EVENT" "DECODE-CORE-ERROR" "DEFAULT-ERROR-HANDLER"
+	   "DEFAULT-KEYSYM-INDEX" "DEFAULT-KEYSYM-TRANSLATE" "DEFINE-ERROR"
+	   "DEFINE-EXTENSION" "DEFINE-GCONTEXT-ACCESSOR" "DEFINE-KEYSYM"
+	   "DEFINE-KEYSYM-SET" "DELETE-PROPERTY" "DELETE-RESOURCE"
+	   "DESTROY-SUBWINDOWS" "DESTROY-WINDOW" "DEVICE-BUSY"
+	   "DEVICE-EVENT-MASK" "DEVICE-EVENT-MASK-CLASS"
+	   "DISCARD-CURRENT-EVENT" "DISCARD-FONT-INFO" "DISPLAY"
+	   "DISPLAY-AFTER-FUNCTION" "DISPLAY-AUTHORIZATION-DATA"
+	   "DISPLAY-AUTHORIZATION-NAME" "DISPLAY-BITMAP-FORMAT"
+	   "DISPLAY-BYTE-ORDER" "DISPLAY-DEFAULT-SCREEN" "DISPLAY-DISPLAY"
+	   "DISPLAY-ERROR-HANDLER" "DISPLAY-FINISH-OUTPUT"
+	   "DISPLAY-FORCE-OUTPUT" "DISPLAY-HOST" "DISPLAY-IMAGE-LSB-FIRST-P"
+	   "DISPLAY-INVOKE-AFTER-FUNCTION" "DISPLAY-KEYCODE-RANGE"
+	   "DISPLAY-MAX-KEYCODE" "DISPLAY-MAX-REQUEST-LENGTH"
+	   "DISPLAY-MIN-KEYCODE" "DISPLAY-MOTION-BUFFER-SIZE"
+	   "DISPLAY-NSCREENS" "DISPLAY-P" "DISPLAY-PIXMAP-FORMATS"
+	   "DISPLAY-PLIST" "DISPLAY-PROTOCOL-MAJOR-VERSION"
+	   "DISPLAY-PROTOCOL-MINOR-VERSION" "DISPLAY-PROTOCOL-VERSION"
+	   "DISPLAY-RELEASE-NUMBER" "DISPLAY-REPORT-ASYNCHRONOUS-ERRORS"
+	   "DISPLAY-RESOURCE-ID-BASE" "DISPLAY-RESOURCE-ID-MASK"
+	   "DISPLAY-ROOTS" "DISPLAY-VENDOR" "DISPLAY-VENDOR-NAME"
+	   "DISPLAY-XDEFAULTS" "DISPLAY-XID" "DRAW-ARC" "DRAW-ARCS"
+	   "DRAW-DIRECTION" "DRAW-GLYPH" "DRAW-GLYPHS" "DRAW-IMAGE-GLYPH"
+	   "DRAW-IMAGE-GLYPHS" "DRAW-LINE" "DRAW-LINES" "DRAW-POINT"
+	   "DRAW-POINTS" "DRAW-RECTANGLE" "DRAW-RECTANGLES" "DRAW-SEGMENTS"
+	   "DRAWABLE" "DRAWABLE-BORDER-WIDTH" "DRAWABLE-DEPTH"
+	   "DRAWABLE-DISPLAY" "DRAWABLE-EQUAL" "DRAWABLE-ERROR"
+	   "DRAWABLE-HEIGHT" "DRAWABLE-ID" "DRAWABLE-P" "DRAWABLE-PLIST"
+	   "DRAWABLE-ROOT" "DRAWABLE-WIDTH" "DRAWABLE-X" "DRAWABLE-Y"
+	   "ERROR-KEY" "EVENT-CASE" "EVENT-COND" "EVENT-HANDLER" "EVENT-KEY"
+	   "EVENT-LISTEN" "EVENT-MASK" "EVENT-MASK-CLASS" "EXTENSION-OPCODE"
+	   "FIND-ATOM" "FONT" "FONT-ALL-CHARS-EXIST-P" "FONT-ASCENT"
+	   "FONT-DEFAULT-CHAR" "FONT-DESCENT" "FONT-DIRECTION" "FONT-DISPLAY"
+	   "FONT-EQUAL" "FONT-ERROR" "FONT-ID" "FONT-MAX-BYTE1"
+	   "FONT-MAX-BYTE2" "FONT-MAX-CHAR" "FONT-MIN-BYTE1" "FONT-MIN-BYTE2"
+	   "FONT-MIN-CHAR" "FONT-NAME" "FONT-P" "FONT-PATH" "FONT-PLIST"
+	   "FONT-PROPERTIES" "FONT-PROPERTY" "FONTABLE"
+	   "FORCE-GCONTEXT-CHANGES" "FREE-COLORMAP" "FREE-COLORS"
+	   "FREE-CURSOR" "FREE-GCONTEXT" "FREE-PIXMAP" "GCONTEXT"
+	   "GCONTEXT-ARC-MODE" "GCONTEXT-BACKGROUND" "GCONTEXT-CACHE-P"
+	   "GCONTEXT-CAP-STYLE" "GCONTEXT-CLIP-MASK" "GCONTEXT-CLIP-ORDERING"
+	   "GCONTEXT-CLIP-X" "GCONTEXT-CLIP-Y" "GCONTEXT-DASH-OFFSET"
+	   "GCONTEXT-DASHES" "GCONTEXT-DISPLAY" "GCONTEXT-EQUAL"
+	   "GCONTEXT-ERROR" "GCONTEXT-EXPOSURES" "GCONTEXT-FILL-RULE"
+	   "GCONTEXT-FILL-STYLE" "GCONTEXT-FONT" "GCONTEXT-FOREGROUND"
+	   "GCONTEXT-FUNCTION" "GCONTEXT-ID" "GCONTEXT-JOIN-STYLE"
+	   "GCONTEXT-KEY" "GCONTEXT-LINE-STYLE" "GCONTEXT-LINE-WIDTH"
+	   "GCONTEXT-P" "GCONTEXT-PLANE-MASK" "GCONTEXT-PLIST"
+	   "GCONTEXT-STIPPLE" "GCONTEXT-SUBWINDOW-MODE" "GCONTEXT-TILE"
+	   "GCONTEXT-TS-X" "GCONTEXT-TS-Y" "GET-EXTERNAL-EVENT-CODE"
+	   "GET-IMAGE" "GET-PROPERTY" "GET-RAW-IMAGE" "GET-RESOURCE"
+	   "GET-SEARCH-RESOURCE" "GET-SEARCH-TABLE" "GET-STANDARD-COLORMAP"
+	   "GET-WM-CLASS" "GLOBAL-POINTER-POSITION" "GRAB-BUTTON" "GRAB-KEY"
+	   "GRAB-KEYBOARD" "GRAB-POINTER" "GRAB-SERVER" "GRAB-STATUS"
+	   "ICON-SIZES" "ICONIFY-WINDOW" "ID-CHOICE-ERROR"
+	   "ILLEGAL-REQUEST-ERROR" "IMAGE" "IMAGE-BLUE-MASK" "IMAGE-DEPTH"
+	   "IMAGE-GREEN-MASK" "IMAGE-HEIGHT" "IMAGE-NAME" "IMAGE-PIXMAP"
+	   "IMAGE-PLIST" "IMAGE-RED-MASK" "IMAGE-WIDTH" "IMAGE-X"
+	   "IMAGE-X-HOT" "IMAGE-X-P" "IMAGE-XY" "IMAGE-XY-BITMAP-LIST"
+	   "IMAGE-XY-P" "IMAGE-Y-HOT" "IMAGE-Z" "IMAGE-Z-BITS-PER-PIXEL"
+	   "IMAGE-Z-P" "IMAGE-Z-PIXARRAY" "IMPLEMENTATION-ERROR"
+	   "INPUT-FOCUS" "INSTALL-COLORMAP" "INSTALLED-COLORMAPS" "INT16"
+	   "INT32" "INT8" "INTERN-ATOM" "INVALID-FONT" "KEYBOARD-CONTROL"
+	   "KEYBOARD-MAPPING" "KEYCODE->CHARACTER" "KEYCODE->KEYSYM" "KEYSYM"
+	   "KEYSYM->CHARACTER" "KEYSYM->KEYCODES" "KEYSYM-IN-MAP-P"
+	   "KEYSYM-SET" "KILL-CLIENT" "KILL-TEMPORARY-CLIENTS" "LENGTH-ERROR"
+	   "LIST-EXTENSIONS" "LIST-FONT-NAMES" "LIST-FONTS" "LIST-PROPERTIES"
+	   "LOAD-CLX" "LOOKUP-COLOR" "LOOKUP-ERROR" "MAKE-COLOR"
+	   "MAKE-EVENT-HANDLERS" "MAKE-EVENT-KEYS" "MAKE-EVENT-MASK"
+	   "MAKE-RESOURCE-DATABASE" "MAKE-STATE-KEYS" "MAKE-STATE-MASK"
+	   "MAKE-WM-HINTS" "MAKE-WM-SIZE-HINTS" "MAP-RESOURCE"
+	   "MAP-SUBWINDOWS" "MAP-WINDOW" "MAPPING-NOTIFY" "MASK16" "MASK32"
+	   "MATCH-ERROR" "MAX-CHAR-ASCENT" "MAX-CHAR-ATTRIBUTES"
+	   "MAX-CHAR-DESCENT" "MAX-CHAR-LEFT-BEARING"
+	   "MAX-CHAR-RIGHT-BEARING" "MAX-CHAR-WIDTH" "MERGE-RESOURCES"
+	   "MIN-CHAR-ASCENT" "MIN-CHAR-ATTRIBUTES" "MIN-CHAR-DESCENT"
+	   "MIN-CHAR-LEFT-BEARING" "MIN-CHAR-RIGHT-BEARING" "MIN-CHAR-WIDTH"
+	   "MISSING-PARAMETER" "MODIFIER-KEY" "MODIFIER-MAPPING"
+	   "MODIFIER-MASK" "MOTION-EVENTS" "NAME-ERROR" "NO-OPERATION"
+	   "OPEN-DISPLAY" "OPEN-FONT" "PIXARRAY" "PIXEL" "PIXMAP"
+	   "PIXMAP-DISPLAY" "PIXMAP-EQUAL" "PIXMAP-ERROR" "PIXMAP-FORMAT"
+	   "PIXMAP-FORMAT-BITS-PER-PIXEL" "PIXMAP-FORMAT-DEPTH"
+	   "PIXMAP-FORMAT-P" "PIXMAP-FORMAT-SCANLINE-PAD" "PIXMAP-ID"
+	   "PIXMAP-P" "PIXMAP-PLIST" "POINT-SEQ" "POINTER-CONTROL"
+	   "POINTER-EVENT-MASK" "POINTER-EVENT-MASK-CLASS" "POINTER-MAPPING"
+	   "POINTER-POSITION" "PROCESS-EVENT" "PUT-IMAGE" "PUT-RAW-IMAGE"
+	   "QUERY-BEST-CURSOR" "QUERY-BEST-STIPPLE" "QUERY-BEST-TILE"
+	   "QUERY-COLORS" "QUERY-EXTENSION" "QUERY-KEYMAP" "QUERY-POINTER"
+	   "QUERY-TREE" "QUEUE-EVENT" "READ-BITMAP-FILE" "READ-RESOURCES"
+	   "RECOLOR-CURSOR" "RECT-SEQ" "REMOVE-ACCESS-HOST"
+	   "REMOVE-FROM-SAVE-SET" "REPARENT-WINDOW" "REPEAT-SEQ"
+	   "REPLY-LENGTH-ERROR" "REPLY-TIMEOUT" "REQUEST-ERROR"
+	   "RESET-SCREEN-SAVER" "RESOURCE-DATABASE"
+	   "RESOURCE-DATABASE-TIMESTAMP" "RESOURCE-ERROR" "RESOURCE-ID"
+	   "RESOURCE-KEY" "RGB-COLORMAPS" "RGB-VAL" "ROOT-RESOURCES"
+	   "ROTATE-CUT-BUFFERS" "ROTATE-PROPERTIES" "SCREEN"
+	   "SCREEN-BACKING-STORES" "SCREEN-BLACK-PIXEL"
+	   "SCREEN-DEFAULT-COLORMAP" "SCREEN-DEPTHS"
+	   "SCREEN-EVENT-MASK-AT-OPEN" "SCREEN-HEIGHT"
+	   "SCREEN-HEIGHT-IN-MILLIMETERS" "SCREEN-MAX-INSTALLED-MAPS"
+	   "SCREEN-MIN-INSTALLED-MAPS" "SCREEN-P" "SCREEN-PLIST"
+	   "SCREEN-ROOT" "SCREEN-ROOT-DEPTH" "SCREEN-ROOT-VISUAL"
+	   "SCREEN-ROOT-VISUAL-INFO" "SCREEN-SAVE-UNDERS-P" "SCREEN-SAVER"
+	   "SCREEN-WHITE-PIXEL" "SCREEN-WIDTH" "SCREEN-WIDTH-IN-MILLIMETERS"
+	   "SEG-SEQ" "SELECTION-OWNER" "SEND-EVENT" "SEQUENCE-ERROR"
+	   "SET-ACCESS-CONTROL" "SET-CLOSE-DOWN-MODE" "SET-INPUT-FOCUS"
+	   "SET-MODIFIER-MAPPING" "SET-POINTER-MAPPING" "SET-SCREEN-SAVER"
+	   "SET-SELECTION-OWNER" "SET-STANDARD-COLORMAP"
+	   "SET-STANDARD-PROPERTIES" "SET-WM-CLASS" "SET-WM-PROPERTIES"
+	   "SET-WM-RESOURCES" "STATE-KEYSYM-P" "STATE-MASK-KEY" "STORE-COLOR"
+	   "STORE-COLORS" "STRINGABLE" "TEXT-EXTENTS" "TEXT-WIDTH"
+	   "TIMESTAMP" "TRANSIENT-FOR" "TRANSLATE-COORDINATES"
+	   "TRANSLATE-DEFAULT" "TRANSLATION-FUNCTION" "TYPE-ERROR"
+	   "UNDEFINE-KEYSYM" "UNEXPECTED-REPLY" "UNGRAB-BUTTON" "UNGRAB-KEY"
+	   "UNGRAB-KEYBOARD" "UNGRAB-POINTER" "UNGRAB-SERVER"
+	   "UNINSTALL-COLORMAP" "UNKNOWN-ERROR" "UNMAP-SUBWINDOWS"
+	   "UNMAP-WINDOW" "VALUE-ERROR" "VISUAL-INFO"
+	   "VISUAL-INFO-BITS-PER-RGB" "VISUAL-INFO-BLUE-MASK"
+	   "VISUAL-INFO-CLASS" "VISUAL-INFO-COLORMAP-ENTRIES"
+	   "VISUAL-INFO-DISPLAY" "VISUAL-INFO-GREEN-MASK" "VISUAL-INFO-ID"
+	   "VISUAL-INFO-P" "VISUAL-INFO-PLIST" "VISUAL-INFO-RED-MASK"
+	   "WARP-POINTER" "WARP-POINTER-IF-INSIDE" "WARP-POINTER-RELATIVE"
+	   "WARP-POINTER-RELATIVE-IF-INSIDE" "WIN-GRAVITY" "WINDOW"
+	   "WINDOW-ALL-EVENT-MASKS" "WINDOW-BACKGROUND"
+	   "WINDOW-BACKING-PIXEL" "WINDOW-BACKING-PLANES"
+	   "WINDOW-BACKING-STORE" "WINDOW-BIT-GRAVITY" "WINDOW-BORDER"
+	   "WINDOW-CLASS" "WINDOW-COLORMAP" "WINDOW-COLORMAP-INSTALLED-P"
+	   "WINDOW-CURSOR" "WINDOW-DISPLAY" "WINDOW-DO-NOT-PROPAGATE-MASK"
+	   "WINDOW-EQUAL" "WINDOW-ERROR" "WINDOW-EVENT-MASK" "WINDOW-GRAVITY"
+	   "WINDOW-ID" "WINDOW-MAP-STATE" "WINDOW-OVERRIDE-REDIRECT"
+	   "WINDOW-P" "WINDOW-PLIST" "WINDOW-PRIORITY" "WINDOW-SAVE-UNDER"
+	   "WINDOW-VISUAL" "WINDOW-VISUAL-INFO" "WITH-DISPLAY"
+	   "WITH-EVENT-QUEUE" "WITH-GCONTEXT" "WITH-SERVER-GRABBED"
+	   "WITH-STATE" "WITHDRAW-WINDOW" "WM-CLIENT-MACHINE"
+	   "WM-COLORMAP-WINDOWS" "WM-COMMAND" "WM-HINTS" "WM-HINTS-FLAGS"
+	   "WM-HINTS-ICON-MASK" "WM-HINTS-ICON-PIXMAP" "WM-HINTS-ICON-WINDOW"
+	   "WM-HINTS-ICON-X" "WM-HINTS-ICON-Y" "WM-HINTS-INITIAL-STATE"
+	   "WM-HINTS-INPUT" "WM-HINTS-P" "WM-HINTS-WINDOW-GROUP"
+	   "WM-ICON-NAME" "WM-NAME" "WM-NORMAL-HINTS" "WM-PROTOCOLS"
+	   "WM-RESOURCES" "WM-SIZE-HINTS" "WM-SIZE-HINTS-BASE-HEIGHT"
+	   "WM-SIZE-HINTS-BASE-WIDTH" "WM-SIZE-HINTS-HEIGHT"
+	   "WM-SIZE-HINTS-HEIGHT-INC" "WM-SIZE-HINTS-MAX-ASPECT"
+	   "WM-SIZE-HINTS-MAX-HEIGHT" "WM-SIZE-HINTS-MAX-WIDTH"
+	   "WM-SIZE-HINTS-MIN-ASPECT" "WM-SIZE-HINTS-MIN-HEIGHT"
+	   "WM-SIZE-HINTS-MIN-WIDTH" "WM-SIZE-HINTS-P"
+	   "WM-SIZE-HINTS-USER-SPECIFIED-POSITION-P"
+	   "WM-SIZE-HINTS-USER-SPECIFIED-SIZE-P" "WM-SIZE-HINTS-WIDTH"
+	   "WM-SIZE-HINTS-WIDTH-INC" "WM-SIZE-HINTS-WIN-GRAVITY"
+	   "WM-SIZE-HINTS-X" "WM-SIZE-HINTS-Y" "WM-ZOOM-HINTS"
+	   "WRITE-BITMAP-FILE" "WRITE-RESOURCES" "XATOM"))
 
 (defpackage "C-CALL"
             (:export "C-STRING" "CHAR" "DOUBLE" "FLOAT" "INT" "LONG" "SHORT"
@@ -378,7 +379,9 @@
             (:export "*VARIABLE-DECLARATIONS*" "DEFINE-WALKER-TEMPLATE"
              "NESTED-WALK-FORM" "VARIABLE-DECLARATION"
              "VARIABLE-GLOBALLY-SPECIAL-P" "VARIABLE-LEXICAL-P"
-             "VARIABLE-SPECIAL-P" "WALK-FORM"))
+             "VARIABLE-SPECIAL-P" "WALK-FORM"
+	     "WALK-FORM-EXPAND-MACROS-P" "MACROEXPAND-ALL"))
+
 (defpackage "UNIX"
             (:export "CADDR-T" "D-INO" "D-NAME" "D-NAMLEN" "D-OFF" "D-RECLEN"
              "DADDR-T" "DEV-T" "DIRECT" "EXECGRP" "EXECOTH" "EXECOWN" "F-DUPFD"
@@ -754,7 +757,8 @@
              "WITH-CONDITION-RESTARTS" "COMMON" "HASH-TABLE-WEAK-P"
              "GET-SETF-EXPANSION" "STYLE-WARNING" "SPECIAL-OPERATOR-P"
              "COMPILER-MACRO" "PRINT-NOT-READABLE-OBJECT"
-             "DEFINE-SETF-EXPANDER" "PRINT-NOT-READABLE"))
+             "DEFINE-SETF-EXPANDER" "PRINT-NOT-READABLE" "METHOD"
+	     "METHOD-COMBINATION" "DYNAMIC-EXTENT"))
 
 (defpackage "EVAL"
             (:export "*EVAL-STACK-TRACE*" "*INTERNAL-APPLY-NODE-TRACE*"
@@ -933,7 +937,11 @@
 	   "SCAVENGER-HOOK-TYPE"
 	   "FUNCTION-NAME-SLOT"
 	   "DYLAN-FUNCTION-HEADER-TYPE"
+	   "LIST-ALLOCATED-OBJECTS"
+	   "FUNCALLABLE-INSTANCE-LAYOUT-SLOT"
+	   "FUNCALLABLE-INSTANCE-LEXENV-SLOT"
 	   ))
+
 (defpackage "CONDITIONS")
 (intern "DISASSEMBLE" "LISP")
 (defpackage "DISASSEM"
@@ -1135,7 +1143,9 @@
                           "*INLINE-EXPANSION-LIMIT*"
                           "INSTANCE"
                           "*EFFICIENCY-NOTE-COST-THRESHOLD*"
-                          "*USE-IMPLEMENTATION-TYPES*"))
+                          "*USE-IMPLEMENTATION-TYPES*"
+			  "*BYTE-COMPILE-TOP-LEVEL*"
+			  "*BYTE-COMPILE-DEFAULT*"))
 (defpackage "LOOP")
 (defpackage "HEMLOCK-INTERNALS"
 	    (:nicknames "HI")
@@ -1406,7 +1416,26 @@
 	   "BACKEND-PAGE-SIZE"
 	   "NOTE-NEXT-INSTRUCTION"
 	   "SET-SLOT"
-	   "LOCATION-NUMBER"))
+	   "LOCATION-NUMBER"
+"BYTE-FASL-FILE-VERSION"
+"*COMPILE-COMPONENT*"
+"BLOCK-NUMBER"
+"DYNCOUNT-INFO-COUNTS"
+"BACKEND-BYTE-FASL-FILE-IMPLEMENTATION"
+"IR2-BLOCK-BLOCK"
+"DISASSEM-BYTE-COMPONENT"
+"LITTLE-ENDIAN-FASL-FILE-IMPLEMENTATION"
+"DYNCOUNT-INFO-COSTS"
+"FUNCALLABLE-INSTANCE-LEXENV"
+"DISASSEM-BYTE-FUN"
+"VOP-BLOCK"
+"BACKEND-BYTE-FASL-FILE-TYPE"
+"BIG-ENDIAN-FASL-FILE-IMPLEMENTATION"
+"*ASSEMBLY-OPTIMIZE*"
+"LARGE-ALLOC"
+"%SET-FUNCTION-SELF"
+"IR2-COMPONENT-DYNCOUNT-INFO"
+))
 
 (defpackage "DIRED"
 	    (:shadow "RENAME-FILE" "DELETE-FILE")
@@ -1800,7 +1829,8 @@
 	   "BASIC-STRUCTURE-CLASS" "FUNCALLABLE-STRUCTURE-CLASS-P"
 	   "BYTE-CLOSURE-FUNCTION" "REGISTER-LAYOUT" "BYTE-CLOSURE-DATA"
 	   "FUNCALLABLE-INSTANCE" "RANDOM-FIXNUM-MAX" "MAKE-RANDOM-PCL-CLASS"
-	   ))
+	   "INSTANCE-LAMBDA" "%FUNCALLABLE-INSTANCE-LEXENV" "%MAKE-SYMBOL"
+	   "%FUNCALLABLE-INSTANCE-FUNCTION" "SYMBOL-HASH"))
 
 (dolist
     (name
@@ -1820,4 +1850,5 @@
 	   "APPEND-SEGMENT" "FINALIZE-SEGMENT"
 	   "SEGMENT-MAP-OUTPUT" "RELEASE-SEGMENT"
 	   "READS" "WRITES" "SEGMENT"
-	   "WITHOUT-SCHEDULING" "BRANCH" "FLUSHABLE" "VARIABLE-LENGTH"))
+	   "WITHOUT-SCHEDULING" "BRANCH" "FLUSHABLE" "VARIABLE-LENGTH"
+	   "SEGMENT-COLLECT-DYNAMIC-STATISTICS"))