[Emacs-diffs] /srv/bzr/emacs/trunk r101738: * subr.el (booleanp): Return t instead of a list (Bug#7086).

[Chong Yidong]

------------------------------------------------------------
revno: 101738
author: Kevin Rodgers <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2010-10-02 21:11:20 -0400
message:
  * subr.el (booleanp): Return t instead of a list (Bug#7086).
modified:
  lisp/ChangeLog
  lisp/subr.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-10-03 00:03:44 +0000
+++ b/lisp/ChangeLog    2010-10-03 01:11:20 +0000
@@ -1,3 +1,7 @@
+2010-10-03  Kevin Rodgers  <address@hidden>
+
+       * subr.el (booleanp): Return t instead of a list (Bug#7086).
+
 2010-10-03  Chong Yidong  <address@hidden>
 
        * server.el (server-process-filter, server-return-error): Give

=== modified file 'lisp/subr.el'
--- a/lisp/subr.el      2010-10-02 02:46:13 +0000
+++ b/lisp/subr.el      2010-10-03 01:11:20 +0000
@@ -2420,8 +2420,9 @@
   (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."