aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/lispref/ChangeLog3
-rw-r--r--doc/lispref/variables.texi2
2 files changed, 5 insertions, 0 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 7470df8dbe7..2d86cc2c1ec 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,5 +1,8 @@
12011-07-02 Lars Magne Ingebrigtsen <larsi@gnus.org> 12011-07-02 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 2
3 * variables.texi (Defining Variables): Add an index entry for
4 `set-variable' (bug#7262).
5
3 * frames.texi (Basic Parameters): Document the `explicit-name' 6 * frames.texi (Basic Parameters): Document the `explicit-name'
4 parameter (bug#6951). 7 parameter (bug#6951).
5 8
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index 08712466b5c..a007a4d9cc3 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -466,6 +466,7 @@ the main benefits of defining the variable.) The documentation is
466stored in the symbol's @code{variable-documentation} property. The 466stored in the symbol's @code{variable-documentation} property. The
467Emacs help functions (@pxref{Documentation}) look for this property. 467Emacs help functions (@pxref{Documentation}) look for this property.
468 468
469
469If the documentation string begins with the character @samp{*}, Emacs 470If the documentation string begins with the character @samp{*}, Emacs
470allows users to set it interactively using the @code{set-variable} 471allows users to set it interactively using the @code{set-variable}
471command. However, you should nearly always use @code{defcustom} 472command. However, you should nearly always use @code{defcustom}
@@ -584,6 +585,7 @@ is a user option. Aliases of user options are also user options.
584@end defun 585@end defun
585 586
586@kindex variable-interactive 587@kindex variable-interactive
588@kindex set-variable
587 If a user option variable has a @code{variable-interactive} property, 589 If a user option variable has a @code{variable-interactive} property,
588the @code{set-variable} command uses that value to control reading the 590the @code{set-variable} command uses that value to control reading the
589new value for the variable. The property's value is used as if it were 591new value for the variable. The property's value is used as if it were