From: David Vázquez Date: Sat, 18 May 2013 12:37:35 +0000 (+0100) Subject: Merge branch 'satisfies' of https://github.com/orodley/jscl into satisfies-test X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=f8258ee260132a3fc9633d8d5a8fcf332ba949a5;p=jscl.git Merge branch 'satisfies' of https://github.com/orodley/jscl into satisfies-test Conflicts: src/toplevel.lisp --- f8258ee260132a3fc9633d8d5a8fcf332ba949a5 diff --cc src/toplevel.lisp index 3336333,923c302..2ddc048 --- a/src/toplevel.lisp +++ b/src/toplevel.lisp @@@ -70,15 -69,15 +70,15 @@@ multiple-value-bind multiple-value-call multiple-value-list multiple-value-prog1 nconc nil ninth not nreconc nth nthcdr null numberp or otherwise package-name package-use-list packagep pairlis - parse-integer plusp pop prin1-to-string print proclaim prog prog1 - parse-integer plusp pop position prin1-to-string print proclaim prog - prog1 prog2 progn psetq push quote rassoc read-from-string remove - remove-if remove-if-not return return-from revappend reverse rplaca - rplacd second set setf setq seventh sixth some string string-upcase - string= string< stringp subseq subst symbol-function symbol-name - symbol-package symbol-plist symbol-value symbolp t tagbody tailp - tenth third throw time trace tree-equal truncate unless untrace - unwind-protect values values-list variable vector-push-extend warn - when write-line write-string zerop)) ++ parse-integer plusp pop position prin1-to-string print proclaim prog prog1 + prog2 progn psetq push pushnew quote rassoc read-from-string remove remove-if + remove-if-not return return-from revappend reverse rplaca rplacd + second set setf setq seventh sixth some string string-upcase string= + string< stringp subseq subst symbol-function symbol-name symbol-package + symbol-plist symbol-value symbolp t tagbody tailp tenth third throw + time trace tree-equal truncate unless untrace unwind-protect values + values-list variable vector-push-extend warn when write-line write-string + zerop)) (setq *package* *user-package*)