[Emacs-diffs] master 1e19ee7: Improve description of face merging

[Eli Zaretskii]

branch: master
commit 1e19ee781bf6aae4da32845acc6603d07a2d9c3c
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Improve description of face merging
    
    * doc/lispref/display.texi (Displaying Faces): More accurate
    description of merging face attributes of "underlying text".
    (Bug#1222)
---
 doc/lispref/display.texi | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index fd68208..64b24f7 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -2949,11 +2949,12 @@ For a header line, Emacs applies the @code{header-line} 
face.
 If the text comes from an overlay string via @code{before-string} or
 @code{after-string} properties (@pxref{Overlay Properties}), or from a
 display string (@pxref{Other Display Specs}), and the string doesn't
-contain a @code{face} or @code{mouse-face} property, but the buffer
-text affected by the overlay/display property does define a face,
-Emacs applies the face attributes of the ``underlying'' buffer text.
-Note that this is so even if the overlay or display string is
-displayed in the display margins (@pxref{Display Margins}).
+contain a @code{face} or @code{mouse-face} property, or these
+properties leave some face attributes undefined, but the buffer text
+affected by the overlay/display property does define a face or those
+attributes, Emacs applies the face attributes of the ``underlying''
+buffer text.  Note that this is so even if the overlay or display
+string is displayed in the display margins (@pxref{Display Margins}).
 
 @item
 If any given attribute has not been specified during the preceding