[Emacs-diffs] master 8297df9 2/4: Merge from origin/emacs-26

[Glenn Morris]

branch: master
commit 8297df9d4bc702bb3ce13a4a89baa60c98ed6a11
Merge: 7582cde 8e420c0
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    Merge from origin/emacs-26
    
    8e420c0 Clarify the use of left/right-margin-width in determining cur...
---
 doc/lispref/display.texi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 7c0a56d..428fe95 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -5016,7 +5016,9 @@ means no right marginal area.
   Setting these variables does not immediately affect the window.  These
 variables are checked when a new buffer is displayed in the window.
 Thus, you can make changes take effect by calling
-@code{set-window-buffer}.
+@code{set-window-buffer}.  Do not use these variables to try to
+determine the current width of the left or right margin.  Instead, use
+the function @code{window-margins}.
 
   You can also set the margin widths immediately.