aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorChong Yidong2012-04-12 22:50:58 +0800
committerChong Yidong2012-04-12 22:50:58 +0800
commit81927dd2a4205aa38bc5aaa37eb3aa8ab57fb8de (patch)
treebce00e596f093cd9d095cccf87f3e71d622c7c87 /lisp
parent893585f47bb9e25d39df66fef9674b6baa25e57e (diff)
downloademacs-81927dd2a4205aa38bc5aaa37eb3aa8ab57fb8de.tar.gz
emacs-81927dd2a4205aa38bc5aaa37eb3aa8ab57fb8de.zip
New Lisp manual nodes, Applying Customizations and Custom Themes.
* doc/lispref/customize.texi (Applying Customizations): (Custom Themes): New nodes. * doc/lispref/display.texi (Defining Faces): Reference custom-set-faces. * doc/lispref/modes.texi (Defining Minor Modes, Defining Minor Modes): * doc/lispref/os.texi (Startup Summary): Copyedits. * doc/emacs/custom.texi (Creating Custom Themes): Add reference to Custom Themes node in Lisp manual. * lisp/custom.el (custom-theme-set-variables): Doc fix.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/custom.el21
2 files changed, 17 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 10dd1d5448f..f7469ddb015 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-04-12 Chong Yidong <cyd@gnu.org>
2
3 * custom.el (custom-theme-set-variables): Doc fix.
4
12012-04-12 Glenn Morris <rgm@gnu.org> 52012-04-12 Glenn Morris <rgm@gnu.org>
2 6
3 * international/mule.el (set-auto-coding-for-load): Doc fix. 7 * international/mule.el (set-auto-coding-for-load): Doc fix.
diff --git a/lisp/custom.el b/lisp/custom.el
index bffd30bff21..71dcfb424e5 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -934,16 +934,21 @@ Each of the arguments in ARGS should be a list of this form:
934 934
935 (SYMBOL EXP [NOW [REQUEST [COMMENT]]]) 935 (SYMBOL EXP [NOW [REQUEST [COMMENT]]])
936 936
937This stores EXP (without evaluating it) as the saved value for SYMBOL. 937SYMBOL is the variable name, and EXP is an expression which
938If NOW is present and non-nil, then also evaluate EXP and set 938evaluates to the customized value. EXP will also be stored,
939the default value for the SYMBOL to the value of EXP. 939without evaluating it, in SYMBOL's `saved-value' property, so
940that it can be restored via the Customize interface. It is also
941added to the alist in SYMBOL's `theme-value' property \(by
942calling `custom-push-theme').
940 943
941REQUEST is a list of features we must require in order to 944NOW, if present and non-nil, means to install the variable's
942handle SYMBOL properly. 945value directly now, even if its `defcustom' declaration has not
943COMMENT is a comment string about SYMBOL. 946been executed. This is for internal use only.
947
948REQUEST is a list of features to `require' (which are loaded
949prior to evaluating EXP).
944 950
945EXP itself is saved unevaluated as SYMBOL property `saved-value' and 951COMMENT is a comment string about SYMBOL."
946in SYMBOL's list property `theme-value' \(using `custom-push-theme')."
947 (custom-check-theme theme) 952 (custom-check-theme theme)
948 953
949 ;; Process all the needed autoloads before anything else, so that the 954 ;; Process all the needed autoloads before anything else, so that the