aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2017-06-24 14:53:35 +0300
committerEli Zaretskii2017-06-24 14:53:35 +0300
commitefedb664666563da6455500ade488fd9726be83a (patch)
tree06ee4c091b32c1809c51bcdd1586e2af0295b942 /src
parent55a9298d63121578cd66ef7f14c14b2160aae77d (diff)
downloademacs-efedb664666563da6455500ade488fd9726be83a.tar.gz
emacs-efedb664666563da6455500ade488fd9726be83a.zip
Rename display-line-width
* etc/NEWS: * src/xdisp.c (syms_of_xdisp, maybe_produce_line_number): * lisp/cus-start.el: Rename display-line-width to display-line-number-width.
Diffstat (limited to 'src')
-rw-r--r--src/xdisp.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index 5f86f0bfde6..d23b1768d68 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -20754,8 +20754,8 @@ maybe_produce_line_number (struct it *it)
20754 /* Compute the required width if needed. */ 20754 /* Compute the required width if needed. */
20755 if (!it->lnum_width) 20755 if (!it->lnum_width)
20756 { 20756 {
20757 if (NATNUMP (Vdisplay_line_width)) 20757 if (NATNUMP (Vdisplay_line_number_width))
20758 it->lnum_width = XFASTINT (Vdisplay_line_width); 20758 it->lnum_width = XFASTINT (Vdisplay_line_number_width);
20759 else 20759 else
20760 { 20760 {
20761 /* Max line number to be displayed cannot be more than 20761 /* Max line number to be displayed cannot be more than
@@ -32408,13 +32408,13 @@ after each newline that comes from buffer text. */);
32408 Fmake_variable_buffer_local (Qdisplay_line_numbers); 32408 Fmake_variable_buffer_local (Qdisplay_line_numbers);
32409 DEFSYM (Qrelative, "relative"); 32409 DEFSYM (Qrelative, "relative");
32410 32410
32411 DEFVAR_LISP ("display-line-width", Vdisplay_line_width, 32411 DEFVAR_LISP ("display-line-number-width", Vdisplay_line_number_width,
32412 doc: /* Minimum width of space reserved for line number display. 32412 doc: /* Minimum width of space reserved for line number display.
32413A positive number means reserve that many columns for line numbers, 32413A positive number means reserve that many columns for line numbers,
32414even if the actual number needs less space. 32414even if the actual number needs less space.
32415The default value of nil means compute the space dynamically. 32415The default value of nil means compute the space dynamically.
32416Any other value is treated as nil. */); 32416Any other value is treated as nil. */);
32417 Vdisplay_line_width = Qnil; 32417 Vdisplay_line_number_width = Qnil;
32418 32418
32419 DEFVAR_BOOL ("inhibit-eval-during-redisplay", inhibit_eval_during_redisplay, 32419 DEFVAR_BOOL ("inhibit-eval-during-redisplay", inhibit_eval_during_redisplay,
32420 doc: /* Non-nil means don't eval Lisp during redisplay. */); 32420 doc: /* Non-nil means don't eval Lisp during redisplay. */);