From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 3 Apr 2008 13:42:25 +0000 (+0000)
Subject: (defsetf): Accept a lambda for the 2-arg form.
X-Git-Tag: emacs-pretest-23.0.90~6628
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cb7d9531e7dd987e57ba354b2d5af26022e51e5d;p=emacs.git

(defsetf): Accept a lambda for the 2-arg form.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2f11907944e..2ad5e7b3ac3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index 5fea4f6ea49..1b325218934 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -1619,7 +1619,7 @@ Example:
   (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)