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

[Luc Teirlinck]

Index: emacs/lisp/cus-edit.el
diff -c emacs/lisp/cus-edit.el:1.212 emacs/lisp/cus-edit.el:1.213
*** emacs/lisp/cus-edit.el:1.212        Mon Feb 14 09:50:38 2005
--- emacs/lisp/cus-edit.el      Tue Feb 22 23:12:15 2005
***************
*** 35,41 ****
  ;; that the user will run with M-x, and `Custom-' for interactive commands.
  
  ;; The identity of a customize option is represented by a Lisp symbol.
! ;; There is the following values associated with an option.  
  
  ;; 0. The current value.
  
--- 35,41 ----
  ;; that the user will run with M-x, and `Custom-' for interactive commands.
  
  ;; The identity of a customize option is represented by a Lisp symbol.
! ;; The following values are associated with an option.
  
  ;; 0. The current value.
  
***************
*** 48,89 ****
  
  ;; 1. The widget value.
  
! ;;    This is the value shown in the widget in a customize buffer.  
  
  ;; 2. The customized value.
  
  ;;    This is the last value given to the option through customize.
  
  ;;    It is stored in the 'customized-value' property of the option, in a
! ;;    cons-cell whose car evaluate to the customized value.   
  
  ;; 3. The saved value.
  
  ;;    This is last value saved from customize.
  
  ;;    It is stored in the 'saved-value' property of the option, in a
! ;;    cons-cell whose car evaluate to the saved value.   
  
  ;; 4. The standard value.
  
  ;;    This is the value given in the 'defcustom' declaration.
  
  ;;    It is stored in the 'standard-value' property of the option, in a
! ;;    cons-cell whose car evaluate to the standard value.   
  
  ;; 5. The "think" value.
!    
! ;;    This is what customize think the current value should be.
!    
! ;;    This is the customize value, if any such value exists, otherwise
  ;;    the saved value, if that exists, and as a last resort the standard
! ;;    value. 
  
  ;; The reason for storing values unevaluated: This is so you can have
  ;; values that depend on the environment.  For example, you can have a
! ;; valiable that has one value when Emacs is running under a window
  ;; system, and another value on a tty.  Since the evaluation is only done
! ;; when the variable is firsty initialized, this is only relevant for the
  ;; saved (and standard) values, but affect others values for
  ;; compatibility.
  
--- 48,89 ----
  
  ;; 1. The widget value.
  
! ;;    This is the value shown in the widget in a customize buffer.
  
  ;; 2. The customized value.
  
  ;;    This is the last value given to the option through customize.
  
  ;;    It is stored in the 'customized-value' property of the option, in a
! ;;    cons-cell whose car evaluates to the customized value.
  
  ;; 3. The saved value.
  
  ;;    This is last value saved from customize.
  
  ;;    It is stored in the 'saved-value' property of the option, in a
! ;;    cons-cell whose car evaluates to the saved value.
  
  ;; 4. The standard value.
  
  ;;    This is the value given in the 'defcustom' declaration.
  
  ;;    It is stored in the 'standard-value' property of the option, in a
! ;;    cons-cell whose car evaluates to the standard value.
  
  ;; 5. The "think" value.
! 
! ;;    This is what customize thinks the current value should be.
! 
! ;;    This is the customized value, if any such value exists, otherwise
  ;;    the saved value, if that exists, and as a last resort the standard
! ;;    value.
  
  ;; The reason for storing values unevaluated: This is so you can have
  ;; values that depend on the environment.  For example, you can have a
! ;; variable that has one value when Emacs is running under a window
  ;; system, and another value on a tty.  Since the evaluation is only done
! ;; when the variable is first initialized, this is only relevant for the
  ;; saved (and standard) values, but affect others values for
  ;; compatibility.
  
***************
*** 103,110 ****
  ;;    The widget value is different from the current value.
  
  ;; 2. changed
!    
! ;;    The current value is different from the "think" value.   
  
  ;; 3. set
  
--- 103,110 ----
  ;;    The widget value is different from the current value.
  
  ;; 2. changed
! 
! ;;    The current value is different from the "think" value.
  
  ;; 3. set
  
***************
*** 120,126 ****
  
  ;; 6. rogue
  
! ;;    There are no standard value.
  
  ;; 7. hidden
  
--- 120,130 ----
  
  ;; 6. rogue
  
! ;;    There is no standard value.  This means that the variable was
! ;;    not defined with defcustom.  You can not create a Custom buffer
! ;;    for such variables using the normal interactive Custom commands.
! ;;    However, such Custom buffers can be created in other ways, for
! ;;    instance, by calling `customize-option' non-interactively.
  
  ;; 7. hidden
  
***************
*** 129,135 ****
  ;; 8. mismatch
  
  ;;    The widget value is not valid member of the :type specified for the
! ;;    option. 
  
  ;;; Code:
  
--- 133,139 ----
  ;; 8. mismatch
  
  ;;    The widget value is not valid member of the :type specified for the
! ;;    option.
  
  ;;; Code: