summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorKevin Rodgers <kevin.d.rodgers@gmail.com>2010-10-02 21:11:20 -0400
committerChong Yidong <cyd@stupidchicken.com>2010-10-02 21:11:20 -0400
commitac6ca7baedb745907fa57f360201bee4c36a2e69 (patch)
treecf0a1e0be16281d896a76365f5a173f1bc2f93f3 /lisp
parent6926550f39269b4fd2717f2e5eba8b51ac044fea (diff)
downloademacs-ac6ca7baedb745907fa57f360201bee4c36a2e69.tar.gz
* subr.el (booleanp): Return t instead of a list (Bug#7086).
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/subr.el5
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c25e49a8c8d..d2a75cdc227 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-03 Kevin Rodgers <kevin.d.rodgers@gmail.com>
+
+ * subr.el (booleanp): Return t instead of a list (Bug#7086).
+
2010-10-03 Chong Yidong <cyd@stupidchicken.com>
* server.el (server-process-filter, server-return-error): Give
diff --git a/lisp/subr.el b/lisp/subr.el
index 49a10bed9a8..82e1988156a 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2420,8 +2420,9 @@ Otherwise, return nil."
(or (stringp object) (null object)))
(defun booleanp (object)
- "Return non-nil if OBJECT is one of the two canonical boolean values: t or nil."
- (memq object '(nil t)))
+ "Return t if OBJECT is one of the two canonical boolean values: t or nil.
+Otherwise, return nil."
+ (and (memq object '(nil t)) t))
(defun field-at-pos (pos)
"Return the field at position POS, taking stickiness etc into account."