(defsetf): Improve argument/docstring consistency.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8312df06d6e0842f305d63393b777cd8e65a909e..4ea507543e6f9120ca67ebedb34610eec2fc7604 100644 (file)
--- 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 4a01181e7773f3fa8ff760940199d1a879307986..0301476afc2f2ed7324115352d844973ffb3302c 100644 (file)
--- 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)