Rename functions in lisp/face-remap.el

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1208

4 files changed, 39 insertions, 30 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 41c3e3225bf..f0f08f607bc 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-05  Miles Bader  <miles@gnu.org>
+
+        * display.texi (Temporary Face Changes): Update to reflect function
+        renamings in face-remap.el.
+
 2008-06-04  Miles Bader  <miles@gnu.org>
 
         * display.texi (Temporary Face Changes): Add
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index 47650ec5601..cab75796692 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -1179,7 +1179,7 @@ These are commands which temporarily change the default face used to
 display text in a buffer.
 
 @cindex adjust buffer face height
-@findex adjust-buffer-face-height
+@findex text-scale-adjust
 @kindex C-x C-+
 @kindex C-x C--
 @kindex C-x C-=
@@ -1188,7 +1188,7 @@ To increase the height of the default face in the current buffer one
 step, type @kbd{C-x C-+} or @kbd{C-x C-=}.  To decrease it one step,
 type @kbd{C-x C--}.  To restore the default (global) face height, type
 @kbd{C-x C-0}.  These keys are all bound to the same command,
-@code{adjust-buffer-face-height}, which looks at the last key typed to
+@code{text-scale-adjust}, which looks at the last key typed to
 determine the adjustment to make.
 
 The final key of these commands may be repeated without the leading
@@ -1201,23 +1201,22 @@ decreases the height by the same amount).  As a special case, an
 argument of 0 will remove any scaling currently active.
 
 This command is a special-purpose wrapper around the
-@code{increase-buffer-face-height} command which makes repetition
-convenient even when it is bound in a non-top-level keymap.  For
-binding in a top-level keymap, @code{increase-buffer-face-height} or
-@code{decrease-default-face-height} may be more appropriate."
+@code{text-scale-increase} command which makes repetition convenient
+even when it is bound in a non-top-level keymap.  For binding in a
+top-level keymap, @code{text-scale-increase} or
+@code{text-scale-decrease} may be more appropriate."
 
 @cindex increase buffer face height
-@findex increase-buffer-face-height
+@findex text-scale-increase
 @cindex decrease buffer face height
-@findex decrease-buffer-face-height
-The @code{increase-buffer-face-height} and
-@code{decrease-buffer-face-height} commands increase or decrease the
-height of the default face in the current buffer by one step.  With a
-numeric prefix argument, the size will be increased/decreased by that
-many steps; each step scales the font height by the value of the
-variable @code{text-scale-mode-step}.  If repeated, this command has a
-cumulative effect.  As a special case, a prefix argument of 0 will
-remove any scaling currently active.
+@findex text-scale-decrease
+The @code{text-scale-increase} and @code{text-scale-decrease} commands
+increase or decrease the height of the default face in the current
+buffer by one step.  With a numeric prefix argument, the size will be
+increased/decreased by that many steps; each step scales the font
+height by the value of the variable @code{text-scale-mode-step}.  If
+repeated, this command has a cumulative effect.  As a special case, a
+prefix argument of 0 will remove any scaling currently active.
 
 @findex text-scale-mode
 These commands automatically enable or disable the
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 27ddee117a9..7a8a3875ea2 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-05  Miles Bader  <miles@gnu.org>
+
+        * display.texi (Displaying Faces): Update to reflect function
+        renamings in face-remap.el.
+
 2008-06-05  Juanma Barranquero  <lekktu@gmail.com>
 
         * display.texi (Fontsets): Fix typos.
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 467113f6409..93b57549f7c 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -2439,8 +2439,8 @@ names or face attribute-value pairs.  All face specs are merged
 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
-@code{remove-relative-face-remapping}.  These are intended for face
+added by @code{face-remap-add-relative} (and removed by
+@code{face-remap-remove-relative}.  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 @@ relative specs would be minor modes.
 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
-@code{set-base-face-remapping}.  Because this @emph{overwrites} the
+@code{face-remap-set-base}.  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
-@code{set-base-face-remapping} would be a major mode adding a face
+@code{face-remap-set-base} would be a major mode adding a face
 remappings, e.g., of the default face.
 
 
-@defun add-relative-face-remapping face &rest specs
+@defun 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
-@code{remove-relative-face-remapping}.
+@code{face-remap-remove-relative}.
 
 @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
 
-@defun remove-relative-face-remapping cookie
+@defun face-remap-remove-relative cookie
 This function removes a face remapping previously added by
-@code{add-relative-face-remapping}.  @var{cookie} should be a return
-value from that function.
+@code{face-remap-add-relative}.  @var{cookie} should be a return value
+from that function.
 @end defun
 
-@defun set-base-face-remapping face &rest specs
+@defun 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 @@ single value @code{nil}, which has the opposite result (the global
 definition of @var{face} is ignored).
 @end defun
 
-@defun set-default-base-face-remapping face
+@defun 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