diff --git a/code/exports.lisp b/code/exports.lisp
index cd559930cbfa9941dd051d0bb32608bd304ed279..74354b2056bb6b8763279cf99c9a5411bcf521ce 100644
--- a/code/exports.lisp
+++ b/code/exports.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/exports.lisp,v 1.274 2008/12/29 23:31:37 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/exports.lisp,v 1.275 2008/12/30 15:34:25 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -1241,14 +1241,12 @@
   (:export   "*AFTER-GC-HOOKS*" "*AFTER-SAVE-INITIALIZATIONS*"
 	     "DEBUG"
 	     "FLOATING-POINT-INEXACT"
-	     "*ALL-MODIFIER-NAMES*" "*ANSI-DEFSTRUCT-OPTIONS-P*"
+	     "*ANSI-DEFSTRUCT-OPTIONS-P*"
 	     "*AUTOLOAD-TRANSLATIONS*"
 	     "*BACKUP-EXTENSION*" "*BEFORE-GC-HOOKS*"
              "*BEFORE-SAVE-INITIALIZATIONS*" "*BLOCK-COMPILE-DEFAULT*"
              "*BYTES-CONSED-BETWEEN-GCS*" "*CHAR" "*CLX-FDS-TO-DISPLAYS*"
-             "*COMMAND-LINE-STRINGS*" "*COMMAND-LINE-SWITCHES*"
-             "*COMMAND-LINE-UTILITY-NAME*" "*COMMAND-LINE-WORDS*"
-             "*COMMAND-SWITCH-DEMONS*" "*COMPATIBILITY-WARNINGS*"
+             "*COMPATIBILITY-WARNINGS*"
              "*COMPILE-PROGRESS*" "*DERIVE-FUNCTION-TYPES*"
              "*DESCRIBE-IMPLEMENTATION-DETAILS*" "*DESCRIBE-INDENTATION*"
              "*DESCRIBE-LEVEL*" "*DESCRIBE-PRINT-LENGTH*"
@@ -1259,120 +1257,93 @@
              "*ERROR-PRINT-LENGTH*" "*ERROR-PRINT-LEVEL*" "*GC-INHIBIT-HOOK*"
              "*GC-NOTIFY-AFTER*" "*GC-NOTIFY-BEFORE*" "*GC-VERBOSE*"
 	     "GET-SETF-METHOD" ; temp until uses are converted to g-s-expansion
-             "*HEMLOCK-VERSION*" "*IGNORE-FLOATING-POINT-UNDERFLOW*"
+             "*IGNORE-FLOATING-POINT-UNDERFLOW*"
              "*INFO-ENVIRONMENT*" "*INTEXP-MAXIMUM-EXPONENT*"
              "*KEYWORD-PACKAGE*" "*LISP-PACKAGE*" "*LOAD-IF-SOURCE-NEWER*"
-             "*MAX-OLD-TRACE-INDENTATION*" "*MAX-STEP-INDENTATION*"
              "*MAX-TRACE-INDENTATION*" "*MODULE-FILE-TRANSLATIONS*"
 	     "*PROMPT*" "*REQUIRE-VERBOSE*" "*MODULE-PROVIDER-FUNCTIONS*"
 	     "*SETF-FDEFINITION-HOOK*"
              "*TOP-LEVEL-AUTO-DECLARE*"
 	     "COMPILER-MACROEXPAND-1" "COMPILER-MACROEXPAND"
-             "*UNDEFINED-WARNING-LIMIT*" "ACCEPT-TCP-CONNECTION"
-	     "ACCEPT-UNIX-CONNECTION"
-             "ADD-OOB-HANDLER" "AMBIGUOUS-FILES" "ARGUMENT-LIST" "ASSQ"
+             "*UNDEFINED-WARNING-LIMIT*"
+             "AMBIGUOUS-FILES" "ARGUMENT-LIST" "ASSQ"
              "BASIC-DEFINITION" "BIGNUMP" "BITP" "CACHE-HASH-EQ"
              "CALL-USER-MISCOP" "CANCEL-FINALIZATION" "CAREFUL-SYMBOL-FUNCTION"
-             "CAREFULLY-ADD-FONT-PATHS" "CHAR" "CHAR-KEY-EVENT"
+             "CHAR"
              "CLEAN-UP-COMPILER" "CLEAR-INFO" "CLEAR-SEARCH-LIST"
-             "CLOSE-SOCKET" "CMD-SWITCH-ARG" "CMD-SWITCH-NAME"
-             "CMD-SWITCH-STRING" "CMD-SWITCH-VALUE" "CMD-SWITCH-WORDS"
-             "COLLECT" "COMMAND-LINE-SWITCH" "COMMAND-LINE-SWITCH-P"
+             "COLLECT"
              "COMPACT-INFO-ENVIRONMENT" "COMPILE-FROM-STREAM" "COMPILEDP"
-             "COMPLETE-FILE" "CONCAT-PNAMES" "CONNECT-TO-INET-SOCKET"
+             "COMPLETE-FILE" "CONCAT-PNAMES"
              "CONSTANT" "CONSTANT-ARGUMENT" "CONSTANT-FUNCTION"
-	     "BIND-INET-SOCKET"
-             "CREATE-INET-LISTENER" "CREATE-INET-SOCKET" "CREATE-UNIX-LISTENER"
 	     "DEF-SOURCE-CONTEXT"
-             "DEFAULT-CLX-EVENT-HANDLER" "DEFAULT-DIRECTORY"
-             "DEFINE-CLX-MODIFIER" "DEFINE-HASH-CACHE" "DEFINE-INFO-CLASS"
-             "DEFINE-INFO-TYPE" "DEFINE-KEY-EVENT-MODIFIER"
-             "DEFINE-KEYBOARD-MODIFIER" "DEFINE-KEYSYM" "DEFINE-MOUSE-CODE"
-             "DEFINE-MOUSE-KEYSYM" "DEFMODULE" "DEFSWITCH" "DEFUN-CACHED"
-             "DELETEF" "DELQ" "DISABLE-CLX-EVENT-HANDLING"
-             "DO-ALPHA-KEY-EVENTS" "DO-ANONYMOUS" "DO-INFO"
+             "DEFAULT-DIRECTORY"
+             "DEFINE-HASH-CACHE" "DEFINE-INFO-CLASS"
+             "DEFINE-INFO-TYPE"
+             "DEFMODULE" "DEFUN-CACHED"
+             "DELETEF" "DELQ"
+             "DO-ANONYMOUS" "DO-INFO"
              "DOUBLE-FLOAT-NEGATIVE-INFINITY" "DOUBLE-FLOAT-POSITIVE-INFINITY"
-             "DOUBLE-FLOATP" "DOVECTOR" "ENABLE-CLX-EVENT-HANDLING"
+             "DOUBLE-FLOATP" "DOVECTOR"
              "ENCAPSULATE" "ENCAPSULATED-DEFINITION" "ENCAPSULATED-P"
              "END-BLOCK" "ENUMERATE-SEARCH-LIST" "FILE-COMMENT" "FILE-WRITABLE"
              "FINALIZE" "FIXNUMP" "FLOAT-DENORMALIZED-P" "FLOAT-INFINITY-P"
              "FLOAT-NAN-P" "FLOAT-TRAPPING-NAN-P"
-             "FLOATING-POINT-INVALID" "FLUSH-DISPLAY-EVENTS"
+             "FLOATING-POINT-INVALID"
              "FORMAT-DECODED-TIME" "FORMAT-UNIVERSAL-TIME" "FREEZE-TYPE" "GC"
              "GC-OFF" "GC-ON" "GET-BYTES-CONSED" "GET-BYTES-CONSED-DFIXNUM"
 	     "GET-CODE-POINTER"
-             "GET-COMMAND-LINE-SWITCH" "GET-DATA-POINTER"
+             "GET-DATA-POINTER"
              "GET-FLOATING-POINT-MODES" "GET-PEER-HOST-AND-PORT"
 	     "GET-SOCKET-HOST-AND-PORT"
 	     "GET-STREAM-COMMAND"
-             "HOST-ENTRY" "HOST-ENTRY-ADDR" "HOST-ENTRY-ADDR-LIST"
-             "HOST-ENTRY-ALIASES" "HOST-ENTRY-NAME" "HTONL" "HTONS"
-             "INADDR-ANY" "INDENTING-FURTHER" "INFO"
-             "INHIBIT-WARNINGS" "INTERACTIVE-EVAL" "IPPROTO-TCP" "IPPROTO-UDP"
-	     "IP-STRING"
-             "ITERATE" "KEY-EVENT" "KEY-EVENT-BIT-P" "KEY-EVENT-BITS"
-             "KEY-EVENT-BITS-MODIFIERS" "KEY-EVENT-CHAR" "KEY-EVENT-KEYSYM"
-             "KEY-EVENT-MODIFIER-MASK" "KEY-EVENT-P" "KEYSYM-NAMES"
-             "KEYSYM-PREFERRED-NAME" "LETF" "LETF*" "LISTEN-SKIP-WHITESPACE"
+             "INDENTING-FURTHER" "INFO"
+             "INHIBIT-WARNINGS" "INTERACTIVE-EVAL"
+             "ITERATE"
+             "LETF" "LETF*" "LISTEN-SKIP-WHITESPACE"
              "LOAD-FOREIGN" "LONG-FLOAT-NEGATIVE-INFINITY"
-             "LONG-FLOAT-POSITIVE-INFINITY" "LONG-FLOATP" "LOOKUP-HOST-ENTRY"
-             "MAKE-CASE-FROB-STREAM" "MAKE-INFO-ENVIRONMENT" "MAKE-KEY-EVENT"
-             "MAKE-KEY-EVENT-BITS" "MAKE-SCAVENGER-HOOK"
+             "LONG-FLOAT-POSITIVE-INFINITY" "LONG-FLOATP"
+             "MAKE-CASE-FROB-STREAM" "MAKE-INFO-ENVIRONMENT"
+             "MAKE-SCAVENGER-HOOK"
 	     "MAKE-STREAM-COMMAND" "MAKE-WEAK-POINTER"
-             "MAYBE-INLINE" "MEMQ" "NAME-KEYSYM" "NTOHL" "NTOHS"
-             "OBJECT-SET-EVENT-HANDLER" "OLD-TRACE" "OLD-UNTRACE" "ONCE-ONLY"
-             "OPEN-CLX-DISPLAY" "OPTIMIZE-INTERFACE"
+             "MAYBE-INLINE" "MEMQ"
+             "ONCE-ONLY"
+             "OPTIMIZE-INTERFACE"
 	     "PACKAGE-CHILDREN" "PACKAGE-PARENT" "PARSE-TIME"
              "PACKAGE-LOCK" "PACKAGE-DEFINITION-LOCK" "WITHOUT-PACKAGE-LOCKS"
 	     "UNLOCK-ALL-PACKAGES"
-             "PRINT-DIRECTORY" "PRINT-HERALD" "PRINT-PRETTY-KEY"
-             "PRINT-PRETTY-KEY-EVENT" "PROCESS-ALIVE-P" "PROCESS-CLOSE"
+             "PRINT-DIRECTORY" "PRINT-HERALD"
+             "PROCESS-ALIVE-P" "PROCESS-CLOSE"
              "PROCESS-CORE-DUMPED" "PROCESS-ERROR" "PROCESS-EXIT-CODE"
              "PROCESS-INPUT" "PROCESS-KILL" "PROCESS-OUTPUT" "PROCESS-P"
              "PROCESS-PID" "PROCESS-PLIST" "PROCESS-PTY" "PROCESS-STATUS"
              "PROCESS-STATUS-HOOK" "PROCESS-WAIT" "PUTF" "PURGE-BACKUP-FILES" "QUIT" "RATIOP"
-             "READ-CHAR-NO-EDIT" "REALP" "REMOVE-ALL-OOB-HANDLERS"
-             "REMOVE-OOB-HANDLER" "REQUIRED-ARGUMENT" "RESET-FOREIGN-POINTERS"
+             "READ-CHAR-NO-EDIT" "REALP"
+             "REQUIRED-ARGUMENT" "RESET-FOREIGN-POINTERS"
              "RUN-PROGRAM" "SAVE" "SAVE-LISP"
              "SCAVENGER-HOOK" "SCAVENGER-HOOK-P"
 	     "SCAVENGER-HOOK-VALUE" "SCAVENGER-HOOK-FUNCTION"
 	     "SEARCH-LIST"
-             "SEND-CHARACTER-OUT-OF-BAND" "SERVE-BUTTON-PRESS"
-             "SERVE-BUTTON-RELEASE" "SERVE-CIRCULATE-NOTIFY"
-             "SERVE-CIRCULATE-REQUEST" "SERVE-CLIENT-MESSAGE"
-             "SERVE-COLORMAP-NOTIFY" "SERVE-CONFIGURE-NOTIFY"
-             "SERVE-CONFIGURE-REQUEST" "SERVE-CREATE-NOTIFY"
-             "SERVE-DESTROY-NOTIFY" "SERVE-ENTER-NOTIFY" "SERVE-EXPOSURE"
-             "SERVE-FOCUS-IN" "SERVE-FOCUS-OUT" "SERVE-GRAPHICS-EXPOSURE"
-             "SERVE-GRAVITY-NOTIFY" "SERVE-KEY-PRESS" "SERVE-KEY-RELEASE"
-             "SERVE-LEAVE-NOTIFY" "SERVE-MAP-NOTIFY" "SERVE-MAP-REQUEST"
-             "SERVE-MOTION-NOTIFY" "SERVE-NO-EXPOSURE" "SERVE-PROPERTY-NOTIFY"
-             "SERVE-REPARENT-NOTIFY" "SERVE-RESIZE-REQUEST"
-             "SERVE-SELECTION-CLEAR" "SERVE-SELECTION-NOTIFY"
-             "SERVE-SELECTION-REQUEST" "SERVE-UNMAP-NOTIFY"
-             "SERVE-VISIBILITY-NOTIFY" "SET-FLOATING-POINT-MODES"
+
+             "SET-FLOATING-POINT-MODES"
              "SET-SYMBOL-FUNCTION-CAREFULLY" "SHORT-FLOAT-NEGATIVE-INFINITY"
              "SHORT-FLOAT-POSITIVE-INFINITY" "SHORT-FLOATP"
              "SINGLE-FLOAT-NEGATIVE-INFINITY" "SINGLE-FLOAT-POSITIVE-INFINITY"
              "SINGLE-FLOATP" "SOCKET-ERROR" "START-BLOCK" "STREAM-COMMAND"
              "STREAM-COMMAND-ARGS" "STREAM-COMMAND-NAME" "STREAM-COMMAND-P"
-	     "INSTANCEP" "SYMBOLICATE" "TRANSLATE-CHARACTER"
-             "TRANSLATE-KEY-EVENT" "TRANSLATE-MOUSE-CHARACTER"
-             "TRANSLATE-MOUSE-KEY-EVENT" "TRULY-THE" "UNCOMPILE"
+	     "INSTANCEP" "SYMBOLICATE"
+             "TRULY-THE" "UNCOMPILE"
              "UNDEFINED-VALUE" "UNENCAPSULATE" "UNIX-NAMESTRING" "WEAK-POINTER"
-             "WEAK-POINTER-P" "WEAK-POINTER-VALUE" "WITH-CLX-EVENT-HANDLING"
+             "WEAK-POINTER-P" "WEAK-POINTER-VALUE"
 	     "WITH-FLOAT-TRAPS-MASKED"
 	     "FEATUREP" "*IGNORE-EXTRA-CLOSE-PARENTHESES*" "*HERALD-ITEMS*"
 	     "SEARCH-LIST-DEFINED-P" "BYTES-CONSED-BETWEEN-GCS"
 	     "*LOAD-SOURCE-TYPES*" "*LOAD-OBJECT-TYPES*"
 	     "*DEFAULT-PACKAGE-USE-LIST*" "*GC-RUN-TIME*"
-	     "CONNECT-TO-UNIX-SOCKET"
 	     "DEFINE-HASH-TABLE-TEST"
 
 	     "DO-HASH"
 	     "*EFFICIENCY-NOTE-LIMIT*"
 	     "*ERROR-PRINT-LINES*"
-	     "CREATE-UNIX-SOCKET"
 	     "*INLINE-EXPANSION-LIMIT*"
 	     "INSTANCE"
 	     "*EFFICIENCY-NOTE-COST-THRESHOLD*"
@@ -1380,7 +1351,6 @@
 	     "*BYTE-COMPILE-TOP-LEVEL*"
 	     "*BYTE-COMPILE-DEFAULT*"
 	     "PURIFY" "MAP-APROPOS"
-	     "*BATCH-MODE*"
 	     "COMPILER-LET"
 	     "DEFINE-FUNCTION-NAME-SYNTAX"
 	     "VALID-FUNCTION-NAME-P"
@@ -1391,8 +1361,8 @@
 
 	     "*TRUST-DYNAMIC-EXTENT-DECLARATIONS*"
 
-
 	     "INVALID-FASL")
+
   ;; Gray streams extension.
   (:export "FUNDAMENTAL-BINARY-STREAM" "FUNDAMENTAL-BINARY-INPUT-STREAM"
 	   "FUNDAMENTAL-BINARY-OUTPUT-STREAM" "FUNDAMENTAL-CHARACTER-STREAM"
@@ -1408,14 +1378,51 @@
 	   "STREAM-START-LINE-P" "STREAM-TERPRI" "STREAM-UNREAD-CHAR"
 	   "STREAM-WRITE-BYTE" "STREAM-WRITE-CHAR" "STREAM-WRITE-STRING"
 	   "STREAM-READ-SEQUENCE" "STREAM-WRITE-SEQUENCE")
+
+  ;; Commandline parsing
+  (:export "*COMMAND-LINE-WORDS*" "*COMMAND-LINE-SWITCHES*"
+	   "*COMMAND-SWITCH-DEMONS*" "*COMMAND-LINE-UTILITY-NAME*"
+	   "*COMMAND-LINE-STRINGS*" "*BATCH-MODE*"
+	   "CMD-SWITCH-STRING" "COMMAND-LINE-SWITCH-P"
+	   "CMD-SWITCH-NAME" "CMD-SWITCH-VALUE" "CMD-SWITCH-WORDS" "COMMAND-LINE-SWITCH"
+	   "DEFSWITCH" "CMD-SWITCH-ARG" "GET-COMMAND-LINE-SWITCH")
+  
   ;; PCL declaration identifiers.
   (:export "SLOTS" "AUTO-COMPILE" "NOT-AUTO-COMPILE")
 
   ;; From internet.lisp
-  (:export "ACCEPT-NETWORK-STREAM"
-	     "INET-RECVFROM" "INET-SENDTO" "INET-SHUTDOWN"
-	     "OPEN-NETWORK-STREAM"
-	     "SHUT-RD" "SHUT-WR" "SHUT-RDWR")
+  (:export "HTONL" "NTOHL" "HTONS" "NTOHS" "LOOKUP-HOST-ENTRY" "HOST-ENTRY"
+	   "HOST-ENTRY-NAME" "HOST-ENTRY-ALIASES" "HOST-ENTRY-ADDR-LIST"
+	   "HOST-ENTRY-ADDR" "IP-STRING" "BIND-INET-SOCKET"
+	   "CREATE-UNIX-SOCKET" "CONNECT-TO-UNIX-SOCKET"
+	   "CREATE-UNIX-LISTENER" "ACCEPT-UNIX-CONNECTION" "CREATE-INET-SOCKET"
+	   "CONNECT-TO-INET-SOCKET" "CREATE-INET-LISTENER" "ACCEPT-TCP-CONNECTION"
+	   "CLOSE-SOCKET" "IPPROTO-TCP" "IPPROTO-UDP" "INADDR-ANY" "ADD-OOB-HANDLER"
+	   "REMOVE-OOB-HANDLER" "REMOVE-ALL-OOB-HANDLERS"
+	   "SEND-CHARACTER-OUT-OF-BAND"
+
+	   "INET-RECVFROM" "INET-SENDTO" "INET-SHUTDOWN"
+	   "SHUT-RD" "SHUT-WR" "SHUT-RDWR"
+
+	   "OPEN-NETWORK-STREAM" "ACCEPT-NETWORK-STREAM")
+
+  ;; CLX extensions
+  (:export "OPEN-CLX-DISPLAY" "WITH-CLX-EVENT-HANDLING" "ENABLE-CLX-EVENT-HANDLING"
+	   "DISABLE-CLX-EVENT-HANDLING" "OBJECT-SET-EVENT-HANDLER"
+	   "DEFAULT-CLX-EVENT-HANDLER"
+	   "FLUSH-DISPLAY-EVENTS" "CAREFULLY-ADD-FONT-PATHS"
+
+	   "SERVE-KEY-PRESS" "SERVE-KEY-RELEASE" "SERVE-BUTTON-PRESS"
+	   "SERVE-BUTTON-RELEASE" "SERVE-MOTION-NOTIFY" "SERVE-ENTER-NOTIFY"
+	   "SERVE-LEAVE-NOTIFY" "SERVE-FOCUS-IN" "SERVE-FOCUS-OUT" 
+	   "SERVE-EXPOSURE" "SERVE-GRAPHICS-EXPOSURE" "SERVE-NO-EXPOSURE"
+	   "SERVE-VISIBILITY-NOTIFY" "SERVE-CREATE-NOTIFY" "SERVE-DESTROY-NOTIFY"
+	   "SERVE-UNMAP-NOTIFY" "SERVE-MAP-NOTIFY" "SERVE-MAP-REQUEST"
+	   "SERVE-REPARENT-NOTIFY" "SERVE-CONFIGURE-NOTIFY" "SERVE-GRAVITY-NOTIFY"
+	   "SERVE-RESIZE-REQUEST" "SERVE-CONFIGURE-REQUEST" "SERVE-CIRCULATE-NOTIFY"
+	   "SERVE-CIRCULATE-REQUEST" "SERVE-PROPERTY-NOTIFY" "SERVE-SELECTION-CLEAR"
+	   "SERVE-SELECTION-REQUEST" "SERVE-SELECTION-NOTIFY" "SERVE-COLORMAP-NOTIFY"
+	   "SERVE-CLIENT-MESSAGE")
 
   ;; CLtL2 environment access.
   (:export "VARIABLE-INFORMATION"
@@ -1427,6 +1434,17 @@
   ;; CMUCL extension for binary/text streams
   (:export "BINARY-TEXT-STREAM" "READ-VECTOR" "WRITE-VECTOR")
 
+  ;; Hemlock (main.lisp, key-event.lisp, keytran.lisp)
+  (:export "DEFINE-KEYSYM" "DEFINE-MOUSE-KEYSYM" "NAME-KEYSYM" "KEYSYM-NAMES"
+	   "KEYSYM-PREFERRED-NAME" "DEFINE-KEY-EVENT-MODIFIER" "DEFINE-CLX-MODIFIER"
+	   "MAKE-KEY-EVENT-BITS" "KEY-EVENT-MODIFIER-MASK" "KEY-EVENT-BITS-MODIFIERS"
+	   "*ALL-MODIFIER-NAMES*" "TRANSLATE-KEY-EVENT" "TRANSLATE-MOUSE-KEY-EVENT"
+	   "MAKE-KEY-EVENT" "KEY-EVENT" "KEY-EVENT-P" "KEY-EVENT-BITS" "KEY-EVENT-KEYSYM"
+	   "CHAR-KEY-EVENT" "KEY-EVENT-CHAR" "KEY-EVENT-BIT-P" "DO-ALPHA-KEY-EVENTS"
+	   "PRINT-PRETTY-KEY" "PRINT-PRETTY-KEY-EVENT" "*HEMLOCK-VERSION*"
+	   "DEFINE-MOUSE-CODE" "DEFINE-KEYBOARD-MODIFIER"
+	   "TRANSLATE-CHARACTER" "TRANSLATE-MOUSE-CHARACTER")
+
   #+double-double
   (:export "DOUBLE-DOUBLE-FLOAT" "DD-PI")