aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2012-10-06 13:34:57 -0400
committerStefan Monnier2012-10-06 13:34:57 -0400
commit685f87b00f477c8072bcd15818d9564e7b7d8808 (patch)
tree6f15e26dca0bb41ba2b8f31d545e7273cfef22b3
parent04fafa467506fe9ca9b77d9cdc3f8e25cb8fd5d3 (diff)
downloademacs-685f87b00f477c8072bcd15818d9564e7b7d8808.tar.gz
emacs-685f87b00f477c8072bcd15818d9564e7b7d8808.zip
* lisp/emacs-lisp/cl-macs.el (cl-defstruct): Improve docstring.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/emacs-lisp/cl-loaddefs.el7
-rw-r--r--lisp/emacs-lisp/cl-macs.el5
3 files changed, 9 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 292a536f2c9..e4597b072fb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12012-10-06 Stefan Monnier <monnier@iro.umontreal.ca> 12012-10-06 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * emacs-lisp/cl-macs.el (cl-defstruct): Improve docstring.
4
3 * subr.el (read-passwd-map): New var. 5 * subr.el (read-passwd-map): New var.
4 (read-passwd): Use `read-string' again. 6 (read-passwd): Use `read-string' again.
5 * minibuffer.el (delete-minibuffer-contents): Make it interactive. 7 * minibuffer.el (delete-minibuffer-contents): Make it interactive.
diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el
index 922c9856208..e25ac5f9708 100644
--- a/lisp/emacs-lisp/cl-loaddefs.el
+++ b/lisp/emacs-lisp/cl-loaddefs.el
@@ -260,7 +260,7 @@ Remove from SYMBOL's plist the property PROPNAME and its value.
260;;;;;; cl-typecase cl-ecase cl-case cl-load-time-value cl-eval-when 260;;;;;; cl-typecase cl-ecase cl-case cl-load-time-value cl-eval-when
261;;;;;; cl-destructuring-bind cl-function cl-defmacro cl-defun cl-gentemp 261;;;;;; cl-destructuring-bind cl-function cl-defmacro cl-defun cl-gentemp
262;;;;;; cl-gensym cl--compiler-macro-cXXr cl--compiler-macro-list*) 262;;;;;; cl-gensym cl--compiler-macro-cXXr cl--compiler-macro-list*)
263;;;;;; "cl-macs" "cl-macs.el" "da92f58f688ff6fb4d0098eb0f3acf0b") 263;;;;;; "cl-macs" "cl-macs.el" "6951d080daefb5194b1d21fe9b2deae4")
264;;; Generated autoloads from cl-macs.el 264;;; Generated autoloads from cl-macs.el
265 265
266(autoload 'cl--compiler-macro-list* "cl-macs" "\ 266(autoload 'cl--compiler-macro-list* "cl-macs" "\
@@ -657,8 +657,9 @@ copier, a `NAME-p' predicate, and slot accessors named `NAME-SLOT'.
657You can use the accessors to set the corresponding slots, via `setf'. 657You can use the accessors to set the corresponding slots, via `setf'.
658 658
659NAME may instead take the form (NAME OPTIONS...), where each 659NAME may instead take the form (NAME OPTIONS...), where each
660OPTION is either a single keyword or (KEYWORD VALUE). 660OPTION is either a single keyword or (KEYWORD VALUE) where
661See Info node `(cl)Structures' for a list of valid keywords. 661KEYWORD can be one of :conc-name, :constructor, :copier, :predicate,
662:type, :named, :initial-offset, :print-function, or :include.
662 663
663Each SLOT may instead take the form (SLOT SLOT-OPTS...), where 664Each SLOT may instead take the form (SLOT SLOT-OPTS...), where
664SLOT-OPTS are keyword-value pairs for that slot. Currently, only 665SLOT-OPTS are keyword-value pairs for that slot. Currently, only
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index 56e698bec0a..99bae1944e8 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -2154,8 +2154,9 @@ copier, a `NAME-p' predicate, and slot accessors named `NAME-SLOT'.
2154You can use the accessors to set the corresponding slots, via `setf'. 2154You can use the accessors to set the corresponding slots, via `setf'.
2155 2155
2156NAME may instead take the form (NAME OPTIONS...), where each 2156NAME may instead take the form (NAME OPTIONS...), where each
2157OPTION is either a single keyword or (KEYWORD VALUE). 2157OPTION is either a single keyword or (KEYWORD VALUE) where
2158See Info node `(cl)Structures' for a list of valid keywords. 2158KEYWORD can be one of :conc-name, :constructor, :copier, :predicate,
2159:type, :named, :initial-offset, :print-function, or :include.
2159 2160
2160Each SLOT may instead take the form (SLOT SLOT-OPTS...), where 2161Each SLOT may instead take the form (SLOT SLOT-OPTS...), where
2161SLOT-OPTS are keyword-value pairs for that slot. Currently, only 2162SLOT-OPTS are keyword-value pairs for that slot. Currently, only