aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2017-10-17 19:17:22 +0300
committerEli Zaretskii2017-10-17 19:17:22 +0300
commit2e1b3522b8562f94a98fed07aeddb6b5ba0dbc6c (patch)
tree20fa6a4ec6840c6dfd6033b53865b1b7d4fe84c4
parent5b6e59cfdb6acd7b8c02a7ce66bb9f4815876863 (diff)
downloademacs-2e1b3522b8562f94a98fed07aeddb6b5ba0dbc6c.tar.gz
emacs-2e1b3522b8562f94a98fed07aeddb6b5ba0dbc6c.zip
Improve documentation of 'line-number-display-width'
* doc/lispref/display.texi (Size of Displayed Text): Document the additional 2 columns used for line-number display. * src/indent.c (Fline_number_display_width): Doc fix. (Bug#28248)
-rw-r--r--doc/lispref/display.texi5
-rw-r--r--src/indent.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index afd09cfb330..fbdd810247d 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -2053,8 +2053,9 @@ This function returns the width used for displaying the line numbers
2053in the selected window. Optional argument @var{pixelwise}, if 2053in the selected window. Optional argument @var{pixelwise}, if
2054non-@code{nil}, means return the value in pixels; otherwise the value 2054non-@code{nil}, means return the value in pixels; otherwise the value
2055is returned in column units of the font defined for the 2055is returned in column units of the font defined for the
2056@code{line-number} face. If line numbers are not displayed in the 2056@code{line-number} face, and doesn't include the 2 columns used to pad
2057selected window, the value is zero. Use @code{with-selected-window} 2057the numbers. If line numbers are not displayed in the selected
2058window, the value is zero. Use @code{with-selected-window}
2058(@pxref{Selecting Windows}) if you need this information about another 2059(@pxref{Selecting Windows}) if you need this information about another
2059window. 2060window.
2060@end defun 2061@end defun
diff --git a/src/indent.c b/src/indent.c
index be8676600a5..a3e9b5b0b9a 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -1993,7 +1993,8 @@ DEFUN ("line-number-display-width", Fline_number_display_width,
1993 doc: /* Return the width used for displaying line numbers in the selected window. 1993 doc: /* Return the width used for displaying line numbers in the selected window.
1994If optional argument PIXELWISE is non-nil, return the width in pixels, 1994If optional argument PIXELWISE is non-nil, return the width in pixels,
1995otherwise return the width in columns of the face used to display 1995otherwise return the width in columns of the face used to display
1996line numbers, `line-number'. */) 1996line numbers, `line-number'. Note that in the latter case, the value
1997doesn't include the 2 columns used for padding the numbers. */)
1997 (Lisp_Object pixelwise) 1998 (Lisp_Object pixelwise)
1998{ 1999{
1999 int width, pixel_width; 2000 int width, pixel_width;