[Emacs-diffs] Changes to emacs/doc/lispref/display.texi,v

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     08/06/05 02:42:56

Index: doc/lispref/display.texi
===================================================================
RCS file: /cvsroot/emacs/emacs/doc/lispref/display.texi,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- doc/lispref/display.texi    5 Jun 2008 01:25:58 -0000       1.15
+++ doc/lispref/display.texi    5 Jun 2008 02:42:55 -0000       1.16
@@ -2439,8 +2439,8 @@
 together, with earlier values taking precedence.
 
 The @var{relative_specs_}n values are ``relative specs'', and are
-added by @code{add-relative-face-remapping} (and removed by
address@hidden  These are intended for face
+added by @code{face-remap-add-relative} (and removed by
address@hidden  These are intended for face
 modifications (such as increasing the size).  Typical users of these
 relative specs would be minor modes.
 
@@ -2448,37 +2448,37 @@
 face name, which causes the global definition of that face to be used.
 
 A non-default value of @var{base_specs} may also be set using
address@hidden  Because this @emph{overwrites} the
address@hidden  Because this @emph{overwrites} the
 default base-spec value (which inherits the global face definition),
-it is up to the caller of @code{set-base-face-remapping} to add such
+it is up to the caller of @code{face-remap-set-base} to add such
 inheritance if it is desired.  A typical use of
address@hidden would be a major mode adding a face
address@hidden would be a major mode adding a face
 remappings, e.g., of the default face.
 
 
address@hidden add-relative-face-remapping face &rest specs
address@hidden face-remap-add-relative face &rest specs
 This functions adds a face remapping entry of @var{face} to @var{specs}
 in the current buffer.
 
 It returns a ``cookie'' which can be used to later delete the remapping with
address@hidden
address@hidden
 
 @var{specs} can be any value suitable for the @code{face} text
 property, including a face name, a list of face names, or a
 face-attribute property list.  The attributes given by @var{specs}
 will be merged with any other currently active face remappings of
 @var{face}, and with the global definition of @var{face} (by default;
-this may be changed using @code{set-base-face-remapping}),
-with the most recently added relative remapping taking precedence.
+this may be changed using @code{face-remap-set-base}), with the most
+recently added relative remapping taking precedence.
 @end defun
 
address@hidden remove-relative-face-remapping cookie
address@hidden face-remap-remove-relative cookie
 This function removes a face remapping previously added by
address@hidden  @var{cookie} should be a return
-value from that function.
address@hidden  @var{cookie} should be a return value
+from that function.
 @end defun
 
address@hidden set-base-face-remapping face &rest specs
address@hidden face-remap-set-base face &rest specs
 This function sets the ``base remapping'' of @var{face} in the current
 buffer to @var{specs}.  If @var{specs} is empty, the default base
 remapping is restored, which inherits from the global definition of
@@ -2487,7 +2487,7 @@
 definition of @var{face} is ignored).
 @end defun
 
address@hidden set-default-base-face-remapping face
address@hidden face-remap-reset-base face
 This function sets the ``base remapping'' of @var{face} to its default
 value, which inherits from @var{face}'s global definition.
 @end defun