Index: /trunk/ccl/level-1/l1-readloop.lisp
===================================================================
--- /trunk/ccl/level-1/l1-readloop.lisp	(revision 478)
+++ /trunk/ccl/level-1/l1-readloop.lisp	(revision 479)
@@ -316,5 +316,5 @@
 
   
-;;; Process the "help" option, report parsing errors.
+;;; Process the "help" and "version" options, report parsing errors.
 (defmethod process-application-arguments ((a application) error-flag opts args)
   (declare (ignore args))
@@ -435,12 +435,12 @@
 (defmethod toplevel-function ((a lisp-development-system) init-file)
   (call-next-method)
-  (let* ((lockptr (recursive-lock-ptr *terminal-input-lock*)))
+  (let* ((sr (input-stream-shared-resource *terminal-input*)))
     (make-mcl-listener-process
      "listener"
      *terminal-input*
      *terminal-output*
-     #'(lambda () (%unlock-recursive-lock lockptr))
+     #'(lambda () (when sr (setf (shared-resource-primary-owner sr)
+				 *initial-process*)))
      #'(lambda ()
-	 (%lock-recursive-lock lockptr)
 	 (setq *interactive-abort-process*
 	       *current-process*)
@@ -448,6 +448,5 @@
 	 (listener-function)
 	 nil)
-     nil)
-    (%unlock-recursive-lock lockptr))
+     nil))
   (%set-toplevel #'(lambda ()
 		     (loop
@@ -456,6 +455,5 @@
   (toplevel))
 
-(defmethod application-file-creator ((app lisp-development-system))
-  *ccl-file-creator*)
+
 
 (defmethod application-init-file ((app lisp-development-system))