aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-06-27 00:10:27 -0700
committerGlenn Morris2012-06-27 00:10:27 -0700
commit0ea0e51b33cc3a1b0bebc7c8e21263d00245b702 (patch)
tree88161a1d901c743463262a5efa3e6188a9a7f5ad
parent35ff222c16e3c0a6a0dfd95426f9453ac182a5ed (diff)
downloademacs-0ea0e51b33cc3a1b0bebc7c8e21263d00245b702.tar.gz
emacs-0ea0e51b33cc3a1b0bebc7c8e21263d00245b702.zip
* lisp/custom.el (custom-initialize-delay): Doc fix.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/custom.el4
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5ef714b6878..4e880c81993 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12012-06-27 Glenn Morris <rgm@gnu.org> 12012-06-27 Glenn Morris <rgm@gnu.org>
2 2
3 * custom.el (custom-initialize-delay): Doc fix.
4
3 * eshell/em-alias.el, eshell/em-banner.el, eshell/em-basic.el: 5 * eshell/em-alias.el, eshell/em-banner.el, eshell/em-basic.el:
4 * eshell/em-cmpl.el, eshell/em-dirs.el, eshell/em-glob.el: 6 * eshell/em-cmpl.el, eshell/em-dirs.el, eshell/em-glob.el:
5 * eshell/em-hist.el, eshell/em-ls.el, eshell/em-pred.el: 7 * eshell/em-hist.el, eshell/em-ls.el, eshell/em-pred.el:
diff --git a/lisp/custom.el b/lisp/custom.el
index 50481f2aa7f..edb7fe2eaad 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -120,7 +120,9 @@ the :set function.
120For variables in preloaded files, you can simply use this 120For variables in preloaded files, you can simply use this
121function for the :initialize property. For autoloaded variables, 121function for the :initialize property. For autoloaded variables,
122you will also need to add an autoload stanza calling this 122you will also need to add an autoload stanza calling this
123function, and another one setting the standard-value property." 123function, and another one setting the standard-value property.
124Or you can wrap the defcustom in a progn, to force the autoloader
125to include all of it." ; see eg vc-sccs-search-project-dir
124 ;; No longer true: 126 ;; No longer true:
125 ;; "See `send-mail-function' in sendmail.el for an example." 127 ;; "See `send-mail-function' in sendmail.el for an example."
126 128