From 78155674f3413aa74662589215f6c3066b444a90 Mon Sep 17 00:00:00 2001 From: Samuel Chase Date: Thu, 16 May 2013 22:18:59 +0530 Subject: [PATCH] Actually merge --- src/string.lisp | 4 +--- src/toplevel.lisp | 4 ---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/string.lisp b/src/string.lisp index 756bf96..56c4776 100644 --- a/src/string.lisp +++ b/src/string.lisp @@ -25,7 +25,6 @@ (unless (char= (char s1 i) (char s2 i)) (return-from string= nil)))))) -<<<<<<< HEAD (defun string< (s1 s2) (let ((len-1 (length s1)) (len-2 (length s2))) @@ -36,10 +35,9 @@ (return-from string< i)) (when (and (= i (1- len-1)) (> len-2 len-1)) (return-from string< (1+ i)))))))) -======= + (defun stringp (s) (stringp s)) ->>>>>>> ee0ae303e9d3f7f99eeb3af1824b61f2616f5925 (define-setf-expander char (string index) (let ((g!string (gensym)) diff --git a/src/toplevel.lisp b/src/toplevel.lisp index 2ba05cf..550958b 100644 --- a/src/toplevel.lisp +++ b/src/toplevel.lisp @@ -73,11 +73,7 @@ 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= -<<<<<<< HEAD string< stringp subseq subst symbol-function symbol-name symbol-package -======= - stringp sublis subseq subst symbol-function symbol-name symbol-package ->>>>>>> ee0ae303e9d3f7f99eeb3af1824b61f2616f5925 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 -- 1.7.10.4