[Emacs-diffs] emacs/lisp ChangeLog subr.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/04/29 04:46:20

Modified files:
        lisp           : ChangeLog subr.el 

Log message:
        * subr.el (assoc-default): Doc fix.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15618&r2=1.15619
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/subr.el?cvsroot=emacs&r1=1.636&r2=1.637

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15618
retrieving revision 1.15619
diff -u -b -r1.15618 -r1.15619
--- ChangeLog   29 Apr 2009 03:02:56 -0000      1.15618
+++ ChangeLog   29 Apr 2009 04:46:15 -0000      1.15619
@@ -1,3 +1,7 @@
+2009-04-29  Chong Yidong  <address@hidden>
+
+       * subr.el (assoc-default): Doc fix.
+
 2009-04-29  Ulrich Mueller  <address@hidden>
 
        * files.el (hack-local-variables-prop-line)

Index: subr.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/subr.el,v
retrieving revision 1.636
retrieving revision 1.637
diff -u -b -r1.636 -r1.637
--- subr.el     15 Apr 2009 22:41:20 -0000      1.636
+++ subr.el     29 Apr 2009 04:46:20 -0000      1.637
@@ -371,11 +371,13 @@
 
 (defun assoc-default (key alist &optional test default)
   "Find object KEY in a pseudo-alist ALIST.
-ALIST is a list of conses or objects.  Each element (or the element's car,
-if it is a cons) is compared with KEY by evaluating (TEST (car elt) KEY).
-If that is non-nil, the element matches;
-then `assoc-default' returns the element's cdr, if it is a cons,
-or DEFAULT if the element is not a cons.
+ALIST is a list of conses or objects.  Each element
+ (or the element's car, if it is a cons) is compared with KEY by
+ calling TEST, with two arguments: (i) the element or its car,
+ and (ii) KEY.
+If that is non-nil, the element matches; then `assoc-default'
+ returns the element's cdr, if it is a cons, or DEFAULT if the
+ element is not a cons.
 
 If no element matches, the value is nil.
 If TEST is omitted or nil, `equal' is used."