master 0c8bc8e6d9: ; Fix recent change of documentation of face-remap

[Eli Zaretskii]

branch: master
commit 0c8bc8e6d93d901c96770f798f41cb6aaafdb678
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    ; Fix recent change of documentation of face-remap
    
    * lisp/face-remap.el (text-scale-adjust):
    * doc/emacs/display.texi (Text Scale): Fix wording of recent
    changes to documentation.
---
 doc/emacs/display.texi | 32 +++++++++++++++++++-------------
 lisp/face-remap.el     |  2 +-
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index e065155845..fbff1d4eb6 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -855,7 +855,7 @@ would be selected if you click a mouse or press @key{RET}.
 @section Text Scale
 
 @cindex adjust buffer font size
-@cindex font size, increase or decrease
+@cindex font size of @code{default} face, increase or decrease
 @findex text-scale-adjust
 @kindex C-x C-+
 @kindex C-x C--
@@ -863,21 +863,27 @@ would be selected if you click a mouse or press @key{RET}.
 @kindex C-x C-0
 @kindex C-wheel-down
 @kindex C-wheel-up
-  To increase the font size in the current buffer, type @kbd{C-x C-+}
-or @kbd{C-x C-=}.  To decrease it, type @kbd{C-x C--}.  To restore the
-default (global) font size, type @kbd{C-x C-0}.  These keys are all
-bound to the same command, @code{text-scale-adjust}, which looks at
-the last key typed to determine which action to take and adjusts the
-font size accordingly by changing the height of the default face.
-
-  Most faces are affected by these font size changes, but not faces
-that have an explicit @code{:height} setting.  The two exceptions to
-this are the @code{default} and @code{header} faces: They will both be
-scaled even if they have an explicit @code{:height} setting.
+  To increase the font size of the @code{default} face in the current
+buffer, type @kbd{C-x C-+} or @kbd{C-x C-=}.  To decrease it, type
+@kbd{C-x C--}.  To restore the default (global) font size, type
+@kbd{C-x C-0}.  These keys are all bound to the same command,
+@code{text-scale-adjust}, which looks at the last key typed to
+determine which action to take and adjusts the font size accordingly
+by changing the height of the default face.
+
+  Most faces don't have an explicit setting of the @code{:height}
+attribute, and thus inherit the height from the @code{default} face.
+Those faces are also scaled by the above commands.
+
+  Faces other than @code{default} that have an explicit setting of the
+@code{:height} attribute are not affected by these font size changes.
+The @code{header-line} face is an exception: it will be scaled even if
+it has an explicit setting of the @code{:height} attribute.
 
   Similarly, scrolling the mouse wheel with the @kbd{Ctrl} modifier
 pressed, when the mouse pointer is above buffer text, will increase or
-decrease the font size, depending on the direction of the scrolling.
+decrease the font size of the affected faces, depending on the
+direction of the scrolling.
 
   The final key of these commands may be repeated without the leading
 @kbd{C-x}.  For instance, @kbd{C-x C-= C-= C-=} increases the face
diff --git a/lisp/face-remap.el b/lisp/face-remap.el
index 75d7333f8a..d611671408 100644
--- a/lisp/face-remap.el
+++ b/lisp/face-remap.el
@@ -393,7 +393,7 @@ a top-level keymap, `text-scale-increase' or
 
 Most faces are affected by these font size changes, but not faces
 that have an explicit `:height' setting.  The two exceptions to
-this are the `default' and `header' faces: They will both be
+this are the `default' and `header-line' faces: they will both be
 scaled even if they have an explicit `:height' setting."
   (interactive "p")
   (let ((ev last-command-event)