[Emacs-diffs] Changes to emacs/lisp/custom.el

[Richard M . Stallman]

Index: emacs/lisp/custom.el
diff -c emacs/lisp/custom.el:1.76 emacs/lisp/custom.el:1.77
*** emacs/lisp/custom.el:1.76   Thu Jul 29 01:47:01 2004
--- emacs/lisp/custom.el        Thu Jan  6 03:58:33 2005
***************
*** 710,753 ****
  (put 'custom-local-buffer 'permanent-local t)
  
  (defun custom-set-variables (&rest args)
!   "Initialize variables according to user preferences.
! The settings are registered as theme `user'.
  The arguments should each be a list of the form:
  
!   (SYMBOL VALUE [NOW [REQUEST [COMMENT]]])
  
! The unevaluated VALUE is stored as the saved value for SYMBOL.
! If NOW is present and non-nil, VALUE is also evaluated and bound as
! the default value for the SYMBOL.
  
! REQUEST is a list of features we must 'require for SYMBOL.
  COMMENT is a comment string about SYMBOL."
    (apply 'custom-theme-set-variables 'user args))
  
  (defun custom-theme-set-variables (theme &rest args)
!   "Initialize variables according to settings specified by args.
! Records the settings as belonging to THEME.
  
! The arguments should be a list where each entry has the form:
  
!   (SYMBOL VALUE [NOW [REQUEST [COMMENT]]])
  
! The unevaluated VALUE is stored as the saved value for SYMBOL.
! If NOW is present and non-nil, VALUE is also evaluated and bound as
! the default value for the SYMBOL.
! REQUEST is a list of features we must 'require for SYMBOL.
  COMMENT is a comment string about SYMBOL.
  
  Several properties of THEME and SYMBOL are used in the process:
  
! If THEME property `theme-immediate' is non-nil, this is equivalent of
! providing the NOW argument to all symbols in the argument list: SYMBOL
! is bound to the evaluated VALUE.  The only difference is SYMBOL property
  `force-value': if NOW is non-nil, SYMBOL's property `force-value' is set to
  the symbol `rogue', else if THEME's property `theme-immediate' is non-nil,
! FACE's property `force-face' is set to the symbol `immediate'.
  
! VALUE itself is saved unevaluated as SYMBOL property `saved-value' and
  in SYMBOL's list property `theme-value' \(using `custom-push-theme')."
    (custom-check-theme theme)
    (let ((immediate (get theme 'theme-immediate)))
--- 710,755 ----
  (put 'custom-local-buffer 'permanent-local t)
  
  (defun custom-set-variables (&rest args)
!   "Install user customizations of variable values specified in ARGS.
! These settings are registered as theme `user'.
  The arguments should each be a list of the form:
  
!   (SYMBOL EXP [NOW [REQUEST [COMMENT]]])
  
! This stores EXP (without evaluating it) as the saved value for SYMBOL.
! If NOW is present and non-nil, then also evaluate EXP and set
! the default value for the SYMBOL to the value of EXP.
  
! REQUEST is a list of features we must require in order to
! handle SYMBOL properly.
  COMMENT is a comment string about SYMBOL."
    (apply 'custom-theme-set-variables 'user args))
  
  (defun custom-theme-set-variables (theme &rest args)
!   "Initialize variables for theme THEME according to settings in ARGS.
! Each of the arguments in ARGS should be a list of this form:
  
!   (SYMBOL EXP [NOW [REQUEST [COMMENT]]])
  
! This stores EXP (without evaluating it) as the saved value for SYMBOL.
! If NOW is present and non-nil, then also evaluate EXP and set
! the default value for the SYMBOL to the value of EXP.
  
! REQUEST is a list of features we must require in order to
! handle SYMBOL properly.
  COMMENT is a comment string about SYMBOL.
  
  Several properties of THEME and SYMBOL are used in the process:
  
! If THEME's property `theme-immediate' is non-nil, this is equivalent of
! providing the NOW argument to all symbols in the argument list:
! evaluate each EXP and set the corresponding SYMBOL.  However,
! there's a difference in the handling of SYMBOL's property
  `force-value': if NOW is non-nil, SYMBOL's property `force-value' is set to
  the symbol `rogue', else if THEME's property `theme-immediate' is non-nil,
! SYMBOL's property `force-value' is set to the symbol `immediate'.
  
! EXP itself is saved unevaluated as SYMBOL property `saved-value' and
  in SYMBOL's list property `theme-value' \(using `custom-push-theme')."
    (custom-check-theme theme)
    (let ((immediate (get theme 'theme-immediate)))