aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2013-09-14 19:33:12 +0300
committerEli Zaretskii2013-09-14 19:33:12 +0300
commit6990c412efd951bc8cc4e4986600893b17d7b148 (patch)
treebdb129989a9e8433892e88fd9d5403c09c3d0323
parentd1ec44a551b0b1035df73e14ff9c8b83f51757b8 (diff)
downloademacs-6990c412efd951bc8cc4e4986600893b17d7b148.tar.gz
emacs-6990c412efd951bc8cc4e4986600893b17d7b148.zip
Minor fixes for last change in lispref/display.texi.
Fixes: debbugs:15375
-rw-r--r--doc/lispref/display.texi11
1 files changed, 5 insertions, 6 deletions
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index d63f98c55c4..8ebf440c9fe 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -4190,8 +4190,8 @@ variables:
4190 4190
4191@defvar left-margin-width 4191@defvar left-margin-width
4192This variable specifies the width of the left margin, in character 4192This variable specifies the width of the left margin, in character
4193cell units. It is buffer-local in all buffers. A value of @code{nil} 4193cell (a.k.a.@: ``column'') units. It is buffer-local in all buffers.
4194means no left marginal area. 4194A value of @code{nil} means no left marginal area.
4195@end defvar 4195@end defvar
4196 4196
4197@defvar right-margin-width 4197@defvar right-margin-width
@@ -4209,16 +4209,15 @@ Thus, you can make changes take effect by calling
4209 4209
4210@defun set-window-margins window left &optional right 4210@defun set-window-margins window left &optional right
4211This function specifies the margin widths for window @var{window}, in 4211This function specifies the margin widths for window @var{window}, in
4212character cell (a.k.a.@: ``column''), units. The argument @var{left} 4212character cell units. The argument @var{left} controls the left
4213controls the left margin and @var{right} controls the right margin 4213margin, and @var{right} controls the right margin (default @code{0}).
4214(default @code{0}).
4215@end defun 4214@end defun
4216 4215
4217@defun window-margins &optional window 4216@defun window-margins &optional window
4218This function returns the width of the left and right margins of 4217This function returns the width of the left and right margins of
4219@var{window} as a cons cell of the form @w{@code{(@var{left} 4218@var{window} as a cons cell of the form @w{@code{(@var{left}
4220. @var{right})}}. If one of the two marginal areas does not exist, 4219. @var{right})}}. If one of the two marginal areas does not exist,
4221its width is returned as @code{nil}; if none of the two margins exist, 4220its width is returned as @code{nil}; if neither of the two margins exist,
4222the function returns @code{(nil)}. If @var{window} is @code{nil}, the 4221the function returns @code{(nil)}. If @var{window} is @code{nil}, the
4223selected window is used. 4222selected window is used.
4224@end defun 4223@end defun