Merge branch 'master' of metalzone.distorted.org.uk:~mdw/public-git/lisp

* 'master' of metalzone.distorted.org.uk:~mdw/public-git/lisp:
  sys-base: Fix collection of command-line options for CLisp.
  mdw-mop: Move DEFGENERIC of SLOT-DEFINITION-FILTER.
  optparse-test: Fix to use cl-launch with /bin/sh hack.

Conflicts:
	sys-base.lisp

diff --git a/sys-base.lisp b/sys-base.lisp
index a8e23df..370e80e 100644 (file)
--- a/sys-base.lisp
+++ b/sys-base.lisp
@@ -25,14 +25,14 @@
 
 (defpackage #:runlisp
   (:use #:common-lisp)
-  (:export #:*raw-command-line* #:*command-line* #:exit)
+  (:export #:*command-line* #:exit)
   #+clisp (:import-from #:ext #:exit))
 
 (defpackage #:mdw.sys-base
   (:use #:common-lisp #:runlisp)
   (:export #:exit #:hard-exit #:*program-name* #:*command-line*
-          set-command-line-arguments)
-  (:import-from #:runlisp #:*raw-command-line* #:*command-line* #:exit))
+          #:set-command-line-arguments)
+  (:import-from #:runlisp #:*command-line* #:exit))
 (in-package #:mdw.sys-base)
 
 (defvar *command-line*)
@@ -40,7 +40,7 @@
 
 (defun set-command-line-arguments ()
   (setf *command-line*
-       (or (when (member :cl-launched *features*)
+       (or (when (member :cl-launch *features*)
              (let* ((cll-package (find-package :cl-launch))
                     (name (funcall (intern "GETENV" cll-package)
                                    "CL_LAUNCH_FILE"))