# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1207230145 0
# Node ID 40e064117c8a4a2a30f8848d098325ec2c5c6af8
# Parent  702b99dd7604437aeb6e7e9ce7ffe136f2f380df
(defsetf): Accept a lambda for the 2-arg form.

diff -r 702b99dd7604 -r 40e064117c8a lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Apr 03 13:34:34 2008 +0000
+++ b/lisp/ChangeLog	Thu Apr 03 13:42:25 2008 +0000
@@ -1,5 +1,7 @@
 2008-04-03  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* emacs-lisp/cl-macs.el (defsetf): Accept a lambda for the 2-arg form.
+
 	* vc-bzr.el (vc-bzr-previous-revision, vc-bzr-next-revision): New funs.
 
 2008-04-03  Chong Yidong  <cyd@stupidchicken.com>
diff -r 702b99dd7604 -r 40e064117c8a lisp/emacs-lisp/cl-macs.el
--- a/lisp/emacs-lisp/cl-macs.el	Thu Apr 03 13:34:34 2008 +0000
+++ b/lisp/emacs-lisp/cl-macs.el	Thu Apr 03 13:42:25 2008 +0000
@@ -1619,7 +1619,7 @@
   (defsetf nth (n x) (v) (list 'setcar (list 'nthcdr n x) v))
 
 \(fn NAME [FUNC | ARGLIST (STORE) BODY...])"
-  (if (listp arg1)
+  (if (and (listp arg1) (consp args))
       (let* ((largs nil) (largsr nil)
 	     (temps nil) (tempsr nil)
 	     (restarg nil) (rest-temps nil)