0.8.21.2:

	Remove traces of the '--noprogrammer' option from the sources.

diff --git a/NEWS b/NEWS
index cd649a0..3b6d72c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,7 @@
 changes in sbcl-0.8.22 relative to sbcl-0.8.21:
+  * incompatible change: the --noprogrammer option, deprecated since
+    version 0.7.5.  Please use the equivalent --disable-debugger
+    option instead.
   * fixed inference of the upper bound of an iteration variable.
     (reported by Rajat Datta).
   * fixed bug 376: CONJUGATE type deriver.

diff --git a/make.sh b/make.sh
index a1a1586..35cb61d 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -51,18 +51,11 @@
 # require a second pass, just testing at build-the-cross-compiler time
 # whether the cross-compilation host returns suitable values from 
 # UPGRADED-ARRAY-ELEMENT-TYPE?)
-# FIXME: --noprogrammer was deprecated in sbcl-0.7.5, replaced by 
-# --disable-debugger. We still use the old form here because the
-# change was not preannounced, and it would be rude to make our new
-# version of SBCL unbootstrappable by immediately prior versions.
-# But in a year or so the --noprogrammer here can change to
-# --disable-debugger (and the deprecated --noprogrammer support can
-# go away completely).
 
 build_started=`date`
 echo "//starting build: $build_started"
 
-SBCL_XC_HOST="${1:-sbcl --noprogrammer}"
+SBCL_XC_HOST="${1:-sbcl --disable-debugger}"
 export SBCL_XC_HOST
 echo //SBCL_XC_HOST=\"$SBCL_XC_HOST\"
 

diff --git a/src/code/toplevel.lisp b/src/code/toplevel.lisp
index b944db4..2b6dcbd 100644 (file)
--- a/src/code/toplevel.lisp
+++ b/src/code/toplevel.lisp
@@ -417,13 +417,6 @@ steppers to maintain contextual information.")
                      ((string= option "--noprint")
                       (pop-option)
                       (setf noprint t))
-                     ;; FIXME: --noprogrammer was deprecated in 0.7.5, and
-                     ;; in a year or so this backwards compatibility can
-                     ;; go away.
-                     ((string= option "--noprogrammer")
-                      (warn "treating deprecated --noprogrammer as --disable-debugger")
-                      (pop-option)
-                      (push "(|DISABLE-DEBUGGER|)" reversed-evals))
                      ((string= option "--disable-debugger")
                       (pop-option)
                       (push "(|DISABLE-DEBUGGER|)" reversed-evals))

diff --git a/version.lisp-expr b/version.lisp-expr
index 39bf0d9..333286e 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.8.21.2"
+"0.8.21.3"