X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fsort.lisp;h=7a140fa383a18db5e8d5a09785bd9ecec0d7425c;hb=2c6b90e36a7c0377cd79625eb6c94d580f98cb93;hp=443f83e7157c7ddaa0451d94372596aeeb4f46d2;hpb=f0338f6fa732b21daa4405e19465bd460e0526d9;p=sbcl.git

diff --git a/src/code/sort.lisp b/src/code/sort.lisp
index 443f83e..7a140fa 100644
--- a/src/code/sort.lisp
+++ b/src/code/sort.lisp
@@ -411,8 +411,8 @@
 
 (defun merge (result-type sequence1 sequence2 predicate &key key)
   #!+sb-doc
-  "The sequences Sequence1 and Sequence2 are destructively merged into
-   a sequence of type Result-Type using the Predicate to order the elements."
+  "The sequences SEQUENCE1 and SEQUENCE2 are destructively merged into
+   a sequence of type RESULT-TYPE using PREDICATE to order the elements."
   (if (eq result-type 'list)
       (let ((result (merge-lists* (coerce sequence1 'list)
 				  (coerce sequence2 'list)
@@ -422,12 +422,12 @@
 	     (vector-2 (coerce sequence2 'vector))
 	     (length-1 (length vector-1))
 	     (length-2 (length vector-2))
-	     (result (make-sequence-of-type result-type (+ length-1 length-2))))
+	     (result (make-sequence-of-type result-type
+					    (+ length-1 length-2))))
 	(declare (vector vector-1 vector-2)
 		 (fixnum length-1 length-2))
 
-	#!+high-security
-	(check-type-var result result-type)
+	#!+high-security (aver (typep result result-type))
 	(if (and (simple-vector-p result)
 		 (simple-vector-p vector-1)
 		 (simple-vector-p vector-2))