1.0.13.13: Actually export RESOLVE-CONFLICT et al from SB-EXT

	... as documented, but not as actually done.
	Reported by Maciej Katafiasz sbcl-devel 2008-01-13

	Also slightly better documentation links for *posix-argv*.

diff --git a/NEWS b/NEWS
index 4d3a918..74c2788 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,9 @@
 ;;;; -*- coding: utf-8; -*-
+changes in sbcl-1.0.14 relative to sbcl-1.0.13:
+  * bug fix: RESOLVE-CONFLICT (and the other name conflict machinery)
+    is now actually exported from SB-EXT as documented.  (reported by
+    Maciej Katafiasz)
+
 changes in sbcl-1.0.13 relative to sbcl-1.0.12:
   * minor incompatible change: RUN-PROGRAM now uses execvp(3) to find
     an executable in the search path, and does so in the child

diff --git a/doc/manual/beyond-ansi.texinfo b/doc/manual/beyond-ansi.texinfo
index dedf819..6626f28 100644 (file)
--- a/doc/manual/beyond-ansi.texinfo
+++ b/doc/manual/beyond-ansi.texinfo
@@ -257,6 +257,8 @@ between classes and proper names and between lists of the form
 
 @node Command-line arguments
 @subsection Command-line arguments
+@vindex sb-ext:*posix-argv*
+@vindex *posix-argv*
 
 The UNIX command line can be read from the variable
 @code{sb-ext:*posix-argv*}. 
@@ -338,6 +340,8 @@ mechanisms as follows:
 @node Tools To Help Developers
 @comment  node-name,  next,  previous,  up
 @section Tools To Help Developers
+@findex trace
+@findex inspect
 
 SBCL provides a profiler and other extensions to the ANSI @code{trace}
 facility.  For more information, see @ref{Macro common-lisp:trace}.
@@ -350,6 +354,10 @@ the @code{inspect} prompt.
 
 @node Resolution of Name Conflicts
 @section Resolution of Name Conflicts
+@tindex sb-ext:name-conflict
+@tindex name-conflict
+@findex sb-ext:name-conflict-symbols
+@findex name-conflict-symbols
 
 The ANSI standard (section 11.1.1.2.5) requires that name conflicts in
 packages be resolvable in favour of any of the conflicting symbols.  In

diff --git a/doc/manual/start-stop.texinfo b/doc/manual/start-stop.texinfo
index 13b644e..de0589e 100644 (file)
--- a/doc/manual/start-stop.texinfo
+++ b/doc/manual/start-stop.texinfo
@@ -309,6 +309,8 @@ files follow.
 @node Unix-style Command Line Protocol
 @comment  node-name,  next,  previous,  up
 @subsubsection Unix-style Command Line Protocol
+@vindex sb-ext:*posix-argv*
+@vindex *posix-argv*
 
 Standard Unix tools that are interpreters follow a common command line
 protocol that is necessary to work with ``shebang scripts''. SBCL

diff --git a/package-data-list.lisp-expr b/package-data-list.lisp-expr
index 24d4e26..646947b 100644 (file)
--- a/package-data-list.lisp-expr
+++ b/package-data-list.lisp-expr
@@ -637,6 +637,10 @@ like *STACK-TOP-HINT* and unsupported stuff like *TRACED-FUN-LIST*."
                "IMPLICIT-GENERIC-FUNCTION-WARNING"
                "INVALID-FASL"
 
+               "NAME-CONFLICT" "NAME-CONFLICT-FUNCTION"
+               "NAME-CONFLICT-DATUM" "NAME-CONFLICT-SYMBOLS"
+               "RESOLVE-CONFLICT"
+
                ;; and a mechanism for controlling same at compile time
                "MUFFLE-CONDITIONS" "UNMUFFLE-CONDITIONS"
 
@@ -954,10 +958,6 @@ possibly temporariliy, because it might be used internally."
                "FORMAT-TOO-MANY-ARGS-WARNING" "EXTENSION-FAILURE"
                "STRUCTURE-INITARG-NOT-KEYWORD" "CONSTANT-MODIFIED"
 
-               "NAME-CONFLICT" "NAME-CONFLICT-FUNCTION"
-               "NAME-CONFLICT-DATUM" "NAME-CONFLICT-SYMBOLS"
-               "RESOLVE-CONFLICT"
-
                ;; ..and DEFTYPEs..
                "INDEX" "LOAD/STORE-INDEX"
                "SIGNED-BYTE-WITH-A-BITE-OUT"

diff --git a/version.lisp-expr b/version.lisp-expr
index cc85eff..d93884b 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".)
-"1.0.13.12"
+"1.0.13.13"