[Emacs-diffs] Changes to emacs/man/custom.texi

[Richard M. Stallman]

Index: emacs/man/custom.texi
diff -c emacs/man/custom.texi:1.52 emacs/man/custom.texi:1.53
*** emacs/man/custom.texi:1.52  Wed Aug 14 17:50:08 2002
--- emacs/man/custom.texi       Wed Sep 18 12:11:02 2002
***************
*** 300,305 ****
--- 300,306 ----
  * Groups: Customization Groups.
                               How options are classified in a structure.
  * Changing an Option::       How to edit a value and set an option.
+ * Saving Customizations::    Details of saving customizations.
  * Face Customization::       How to edit the attributes of a face.
  * Specific Customization::   Making a customization buffer for specific
                                  options, faces, or groups.
***************
*** 517,548 ****
  @cindex saving option value
  @cindex customized options, saving
    Setting the option changes its value in the current Emacs session;
! @dfn{saving} the value changes it for future sessions as well.  This
! works by writing code into your @file{~/.emacs} file so as to set the
! option variable again each time you start Emacs.  To save the option,
! invoke @samp{[State]} and select the @samp{Save for Future Sessions}
! operation.
! 
! @vindex custom-file
!   The customization buffer normally saves customizations in
! @file{~/.emacs}.  If you wish, you can save customizations in another
! file instead.  To make this work, your @file{~/.emacs} should set
! @code{custom-file} to the name of that file.  Emacs will then load
! the file right after your @file{.emacs}.  For example:
! 
! @example
! (setq custom-file "~/.emacs-custom")
! @end example
! 
!   If Emacs was invoked with the @option{-q} or @option{--no-init-file}
! options (@pxref{Initial Options}), it will not let you save your
! customizations in your @file{~/.emacs} init file.  This is because
! saving customizations from such a session would wipe out all the other
! customizations you might have on your init file.
  
    You can also restore the option to its standard value by invoking
! @samp{[State]} and selecting the @samp{Erase Customization}
! operation.  There are actually three reset operations:
  
  @table @samp
  @item Reset
--- 518,532 ----
  @cindex saving option value
  @cindex customized options, saving
    Setting the option changes its value in the current Emacs session;
! @dfn{saving} the value changes it for future sessions as well.  To
! save the option, invoke @samp{[State]} and select the @samp{Save for
! Future Sessions} operation.  This works by writing code so as to set
! the option variable again each time you start Emacs (@pxref{Saving
! Customizations}).
  
    You can also restore the option to its standard value by invoking
! @samp{[State]} and selecting the @samp{Erase Customization} operation.
! There are actually three reset operations:
  
  @table @samp
  @item Reset
***************
*** 558,563 ****
--- 542,553 ----
  This sets the option to its standard value, and updates the text
  accordingly.  This also eliminates any saved value for the option,
  so that you will get the standard value in future Emacs sessions.
+ 
+ @item Use Backup Value
+ This sets the option to a previous value that was set in the
+ customization buffer in this session.  If you customize a variable
+ and then reset the variable, which discards the customized value,
+ you can get the customized value back again with this operation.
  @end table
  
  @cindex comments on customized options
***************
*** 589,594 ****
--- 579,616 ----
  Each of the other fields performs an operation---set, save or
  reset---on each of the items in the buffer that could meaningfully be
  set, saved or reset.
+ 
+ @node Saving Customizations
+ @subsubsection Saving Customizations
+ 
+ @vindex custom-file
+   The customization buffer normally saves customizations in
+ @file{~/.emacs}.  If you wish, you can save customizations in another
+ file instead.  To make this work, your @file{~/.emacs} should set
+ @code{custom-file} to the name of that file.  Emacs loads the file
+ right after your @file{.emacs} if you did not load it already.  For
+ example:
+ 
+ @example
+ (setq custom-file "~/.emacs-custom")
+ @end example
+ 
+   The variable @code{custom-file} is useful if you want to have
+ different customizations for different Emacs versions:
+ 
+ @example
+ (if (< emacs-major-version 21)
+     ;; @r{Emacs 20 customization.}
+     (setq custom-file "~/.custom-20.el")
+   ;; @r{Emacs 21 customization.}
+   (setq custom-file "~/.custom-21.el"))
+ @end example
+ 
+   If Emacs was invoked with the @option{-q} or @option{--no-init-file}
+ options (@pxref{Initial Options}), it will not let you save your
+ customizations in your @file{~/.emacs} init file.  This is because
+ saving customizations from such a session would wipe out all the other
+ customizations you might have on your init file.
  
  @node Face Customization
  @subsubsection Customizing Faces