master 3bc34ef635: Clarify precedence rules in Active Display Table manual node

[Lars Ingebrigtsen]

branch: master
commit 3bc34ef635734f72abd584fe3c8a6b3dea76f656
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Clarify precedence rules in Active Display Table manual node
    
    * doc/lispref/display.texi (Active Display Table): Say what "takes
    precedence" means here (bug#18546).
---
 doc/lispref/display.texi | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 9650d22790..0ab683d234 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -8228,7 +8228,10 @@ help buffer.
 The window's display table, if there is one, takes precedence over the
 buffer's display table.  If neither exists, Emacs tries to use the
 standard display table; if that is @code{nil}, Emacs uses the usual
-character display conventions (@pxref{Usual Display}).
+character display conventions (@pxref{Usual Display}).  (Emacs does
+not ``merge'' display tables: For instance, if the window has a
+display table, the buffer's display table and the standard display
+table are completely ignored.)
 
   Note that display tables affect how the mode line is displayed, so
 if you want to force redisplay of the mode line using a new display