Mercurial > hg > xemacs-beta
changeset 4730:0e5b32398bac
automatic merge
| author | Stephen J. Turnbull <stephen@xemacs.org> |
|---|---|
| date | Mon, 02 Nov 2009 13:03:37 +0900 |
| parents | 428d7c571110 (current diff) d0ea57eb3de4 (diff) |
| children | ad40dc9d3a97 |
| files | |
| diffstat | 4 files changed, 16 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Nov 02 12:09:13 2009 +0900 +++ b/lisp/ChangeLog Mon Nov 02 13:03:37 2009 +0900 @@ -1,3 +1,8 @@ +2009-11-01 Aidan Kehoe <kehoea@parhasard.net> + + * cl-extra.el (equalp): + Don't error if handed a string and a non-string. + 2009-11-01 Stephen Turnbull <stephen@xemacs.org> * font.el (font-combine-fonts-internal):
--- a/lisp/cl-extra.el Mon Nov 02 12:09:13 2009 +0900 +++ b/lisp/cl-extra.el Mon Nov 02 13:03:37 2009 +0900 @@ -97,7 +97,8 @@ (cond ((eq x y) t) ((stringp x) ;; XEmacs change: avoid downcase - (eq t (compare-strings x nil nil y nil nil t))) + (and (stringp y) + (eq t (compare-strings x nil nil y nil nil t)))) ;; XEmacs addition: compare characters ((characterp x) (and (characterp y)
--- a/tests/ChangeLog Mon Nov 02 12:09:13 2009 +0900 +++ b/tests/ChangeLog Mon Nov 02 13:03:37 2009 +0900 @@ -1,3 +1,9 @@ +2009-11-01 Aidan Kehoe <kehoea@parhasard.net> + + * automated/lisp-tests.el: + Check that (equal "hi there" [hi there]) gives nil, instead of + erroring; fixes a bug Ben introduced in 2002. + 2009-10-12 Aidan Kehoe <kehoea@parhasard.net> * automated/mule-tests.el :
--- a/tests/automated/lisp-tests.el Mon Nov 02 12:09:13 2009 +0900 +++ b/tests/automated/lisp-tests.el Mon Nov 02 13:03:37 2009 +0900 @@ -2091,3 +2091,6 @@ (letf (((values three one-four-one-five-nine) (floor pi))) (* three one-four-one-five-nine)))) +;; This used to error: +(Assert (nil (equalp "hi there" [hi there])) + "checking equalp doesn't error with string and non-string")