Clarify that SETFUNCTION is only used in the Customize user interface

(bug#6089).

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index c3414e288ac894a5e8d1aa72489745401ee68674..a87cd201676953d8578fb1d8b4f234d2a3c5b912 100644 (file)
--- 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 cb32d0ef340bbad3939f43cb15332d5819ee5870..ff658eb81f844b11da105e2b381d93e471bfb2c6 100644 (file)
--- 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 2955592d43ba18bef8d46a03e6af665d4484266f..d4cce8627c2da842c8ea95529c70253c1bb713c3 100644 (file)
--- 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 2504b4f2cd987b8bfd092f6a97ee1d17fdfd2857..a1c7f3e11e7e87c73c47905afc08742c27efeb87 100644 (file)
--- 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.