From: Juanma Barranquero <lekktu@gmail.com>
Date: Wed, 1 Jun 2005 15:33:50 +0000 (+0000)
Subject: (defsetf): Improve argument/docstring consistency.
X-Git-Tag: emacs-pretest-22.0.90~9368
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=358e4d6d1db0b101d2862f97475f6e5999f8bfa0;p=emacs.git

(defsetf): Improve argument/docstring consistency.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8312df06d6e..4ea507543e6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2005-06-01  Juanma Barranquero  <lekktu@gmail.com>
 
+	* emacs-lisp/cl-macs.el (defsetf):
+	Improve argument/docstring consistency.
+
 	* faces.el (list-faces-display): Improve the formatting by
 	computing the maximum length required for any face-name (reworked
 	patch of 1999-01-11, accidentally deleted on 1999-07-21).
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index 4a01181e777..0301476afc2 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -1565,14 +1565,21 @@ form.  See `defsetf' for a simpler way to define most setf-methods.
 This macro is an easy-to-use substitute for `define-setf-method' that works
 well for simple place forms.  In the simple `defsetf' form, `setf's of
 the form (setf (NAME ARGS...) VAL) are transformed to function or macro
-calls of the form (FUNC ARGS... VAL).  Example: (defsetf aref aset).
+calls of the form (FUNC ARGS... VAL).  Example:
+
+  (defsetf aref aset)
+
 Alternate form: (defsetf NAME ARGLIST (STORE) BODY...).
 Here, the above `setf' call is expanded by binding the argument forms ARGS
 according to ARGLIST, binding the value form VAL to STORE, then executing
 BODY, which must return a Lisp form that does the necessary `setf' operation.
 Actually, ARGLIST and STORE may be bound to temporary variables which are
 introduced automatically to preserve proper execution order of the arguments.
-Example: (defsetf nth (n x) (v) (list 'setcar (list 'nthcdr n x) v))."
+Example:
+
+  (defsetf nth (n x) (v) (list 'setcar (list 'nthcdr n x) v))
+
+\(fn NAME [FUNC | ARGLIST (STORE) BODY...])"
   (if (listp arg1)
       (let* ((largs nil) (largsr nil)
 	     (temps nil) (tempsr nil)