[Emacs-diffs] Changes to emacs/lispref/text.texi

[Colin Walters]

Index: emacs/lispref/text.texi
diff -c emacs/lispref/text.texi:1.54 emacs/lispref/text.texi:1.55
*** emacs/lispref/text.texi:1.54        Tue Apr 30 13:55:02 2002
--- emacs/lispref/text.texi     Sat Jun  8 16:31:13 2002
***************
*** 2318,2323 ****
--- 2318,2332 ----
  overlays.
  @end defun
  
+ @defvar char-property-alias-alist
+ This variable holds an alist which maps property names to a list of
+ alternative property names.  If a character does not specify a direct
+ value for a property, the alternative property names are consulted in
+ order; the first non-nil value is used.  This variable takes
+ precedence over @code{default-text-properties}, and @code{category}
+ properties take precedence over this variable.
+ @end defvar
+ 
  @defun text-properties-at position &optional object
  This function returns the entire property list of the character at
  @var{position} in the string or buffer @var{object}.  If @var{object} is
***************
*** 2327,2337 ****
  @defvar default-text-properties
  This variable holds a property list giving default values for text
  properties.  Whenever a character does not specify a value for a
! property, neither directly nor through a category symbol, the value
! stored in this list is used instead.  Here is an example:
  
  @example
! (setq default-text-properties '(foo 69))
  ;; @r{Make sure character 1 has no properties of its own.}
  (set-text-properties 1 2 nil)
  ;; @r{What we get, when we ask, is the default value.}
--- 2336,2348 ----
  @defvar default-text-properties
  This variable holds a property list giving default values for text
  properties.  Whenever a character does not specify a value for a
! property, neither directly, through a category symbol, or through
! @code{char-property-alias-alist}, the value stored in this list is
! used instead.  Here is an example:
  
  @example
! (setq default-text-properties '(foo 69)
!       char-property-alias-alist nil)
  ;; @r{Make sure character 1 has no properties of its own.}
  (set-text-properties 1 2 nil)
  ;; @r{What we get, when we ask, is the default value.}
***************
*** 2653,2660 ****
  @code{(:foreground @var{color-name})}, and likewise for the background.
  @end itemize
  
! @xref{Font Lock Mode}, for information on how to update @code{face}
! properties automatically based on the contents of the text.
  
  @item mouse-face
  @kindex mouse-face @r{(text property)}
--- 2664,2686 ----
  @code{(:foreground @var{color-name})}, and likewise for the background.
  @end itemize
  
! You can use Font Lock Mode (@pxref{Font Lock Mode}), to dynamically
! update @code{face} properties based on the contents of the text.
! 
! @item font-lock-face
! @kindex font-lock-face @r{(text property)}
! The @code{font-lock-face} property is the same in all respects as the
! @code{face} property, but its state of activation is controlled by
! @code{font-lock-mode}.  This can be advantageous for special buffers
! which are not intended to be user-editable, or for static areas of
! text which are always fontified in the same way.
! @xref{Precalculated Fontification}.
! 
! Strictly speaking, @code{font-lock-face} is not a built-in text
! property; rather, it is implemented in Font Lock mode using
! @code{char-property-alias-alist}.  @xref{Examining Properties}.
! 
! This property is new in Emacs 21.4.
  
  @item mouse-face
  @kindex mouse-face @r{(text property)}