aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-10-28 18:12:53 -0700
committerGlenn Morris2012-10-28 18:12:53 -0700
commita0ccbcbddcdf0c7cb990341fd1b9947c08eaaa15 (patch)
tree5500fe4f9326b9087410b23fd1e652d7c842fa46
parentd3094168d6979f52c770117eb9dc5f034db07fbd (diff)
downloademacs-a0ccbcbddcdf0c7cb990341fd1b9947c08eaaa15.tar.gz
emacs-a0ccbcbddcdf0c7cb990341fd1b9947c08eaaa15.zip
* lisp/emacs-lisp/cl.el (defsetf): Doc fix.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/emacs-lisp/cl.el6
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3265f8acf41..76cc7e52863 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-10-29 Glenn Morris <rgm@gnu.org>
2
3 * emacs-lisp/cl.el (defsetf): Doc fix.
4
12012-10-29 Stefan Monnier <monnier@iro.umontreal.ca> 52012-10-29 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * progmodes/sh-script.el (sh-font-lock-paren): Also put punctuation 7 * progmodes/sh-script.el (sh-font-lock-paren): Also put punctuation
diff --git a/lisp/emacs-lisp/cl.el b/lisp/emacs-lisp/cl.el
index 34beed0d9ef..a558e505e66 100644
--- a/lisp/emacs-lisp/cl.el
+++ b/lisp/emacs-lisp/cl.el
@@ -568,9 +568,9 @@ well for simple place forms. In the simple `defsetf' form, `setf's of
568the form (setf (NAME ARGS...) VAL) are transformed to function or macro 568the form (setf (NAME ARGS...) VAL) are transformed to function or macro
569calls of the form (FUNC ARGS... VAL). Example: 569calls of the form (FUNC ARGS... VAL). Example:
570 570
571 (cl-defsetf aref aset) 571 (defsetf aref aset)
572 572
573Alternate form: (cl-defsetf NAME ARGLIST (STORE) BODY...). 573Alternate form: (defsetf NAME ARGLIST (STORE) BODY...).
574Here, the above `setf' call is expanded by binding the argument forms ARGS 574Here, the above `setf' call is expanded by binding the argument forms ARGS
575according to ARGLIST, binding the value form VAL to STORE, then executing 575according to ARGLIST, binding the value form VAL to STORE, then executing
576BODY, which must return a Lisp form that does the necessary `setf' operation. 576BODY, which must return a Lisp form that does the necessary `setf' operation.
@@ -578,7 +578,7 @@ Actually, ARGLIST and STORE may be bound to temporary variables which are
578introduced automatically to preserve proper execution order of the arguments. 578introduced automatically to preserve proper execution order of the arguments.
579Example: 579Example:
580 580
581 (cl-defsetf nth (n x) (v) `(setcar (nthcdr ,n ,x) ,v)) 581 (defsetf nth (n x) (v) `(setcar (nthcdr ,n ,x) ,v))
582 582
583\(fn NAME [FUNC | ARGLIST (STORE) BODY...])" 583\(fn NAME [FUNC | ARGLIST (STORE) BODY...])"
584 (declare (debug 584 (declare (debug