summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/lispref/ChangeLog3
-rw-r--r--doc/lispref/customize.texi11
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/custom.el3
4 files changed, 14 insertions, 6 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index c3414e288ac..a87cd201676 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,5 +1,8 @@
2011-07-02 Lars Magne Ingebrigtsen <larsi@gnus.org>
+ * customize.texi (Variable Definitions): Clarify that SETFUNCTION
+ is only used in the Customize user interface (bug#6089).
+
* display.texi (Showing Images): Mention the point of sliced
images (bug#7836).
diff --git a/doc/lispref/customize.texi b/doc/lispref/customize.texi
index cb32d0ef340..ff658eb81f8 100644
--- a/doc/lispref/customize.texi
+++ b/doc/lispref/customize.texi
@@ -326,11 +326,12 @@ individual types for a description of how to use @code{:options}.
@item :set @var{setfunction}
@kindex set@r{, @code{defcustom} keyword}
Specify @var{setfunction} as the way to change the value of this
-option. The function @var{setfunction} should take two arguments, a
-symbol (the option name) and the new value, and should do whatever is
-necessary to update the value properly for this option (which may not
-mean simply setting the option as a Lisp variable). The default for
-@var{setfunction} is @code{set-default}.
+option when using the Customize user interface. The function
+@var{setfunction} should take two arguments, a symbol (the option
+name) and the new value, and should do whatever is necessary to update
+the value properly for this option (which may not mean simply setting
+the option as a Lisp variable). The default for @var{setfunction} is
+@code{set-default}.
@item :get @var{getfunction}
@kindex get@r{, @code{defcustom} keyword}
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2955592d43b..d4cce8627c2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
2011-07-02 Lars Magne Ingebrigtsen <larsi@gnus.org>
+ * custom.el (defcustom): Clarify that :set is only used in the
+ Customize user interface (bug#6089).
+
* progmodes/flymake.el (flymake-mode): If the buffer isn't
associated with a file, refuse to run instead of erroring out
(bug#6084).
diff --git a/lisp/custom.el b/lisp/custom.el
index 2504b4f2cd9..a1c7f3e11e7 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -215,7 +215,8 @@ The following keywords are meaningful:
variable. It takes two arguments, the symbol and value
given in the `defcustom' call. The default is
`custom-initialize-reset'.
-:set VALUE should be a function to set the value of the symbol.
+:set VALUE should be a function to set the value of the symbol
+ when using the Customize user interface.
It takes two arguments, the symbol to set and the value to
give it. The default choice of function is `set-default'.
:get VALUE should be a function to extract the value of symbol.