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.

diff --git a/etc/NEWS b/etc/NEWS
index 856ebfe35e7de280df881bb3eb35241166eef527..03204beb9eeb27f7daff3f1e24ad8922dc4c4f1e 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -386,8 +386,10 @@ before the line.  If set to 'relative', Emacs will display the line
 number relative to the line showing point.  The default is nil, which
 doesn't display the line numbers.
 
-You can also customize the new variable 'display-lines-width' to
-specify a fixed minimal with of the area allocated to line-number
+The new face 'line-number' is used to display the line numbers.
+
+You can also customize the new variable 'display-line-number-width'
+to specify a fixed minimal with of the area allocated to line-number
 display.  The default is nil, meaning that Emacs will dynamically
 calculate the area width, enlarging it as needed.  Setting it to a
 non-negative integer specifies that as the minimal width; selecting a

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 0fe41d7c3ea053721f02cc732ed26b4314a53150..773520c64f2c2ccc541a1f72bfb1f09b2cb75870 100644 (file)
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -592,7 +592,7 @@ since it could result in memory overflow and make Emacs crash."
                                     (const :tag "Relative line numbers"
                                            :value relative))
                                    "26.1")
-             (display-line-width display
+             (display-line-number-width display
                                  (choice
                                   (const :tag "Dynamically computed"
                                          :value nil)

diff --git a/src/xdisp.c b/src/xdisp.c
index 5f86f0bfde644a63712a042fa51dfbb87c94da52..d23b1768d68615d74aaba5fbcce1a253ae7625f1 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -20754,8 +20754,8 @@ maybe_produce_line_number (struct it *it)
   /* Compute the required width if needed.  */
   if (!it->lnum_width)
     {
-      if (NATNUMP (Vdisplay_line_width))
-       it->lnum_width = XFASTINT (Vdisplay_line_width);
+      if (NATNUMP (Vdisplay_line_number_width))
+       it->lnum_width = XFASTINT (Vdisplay_line_number_width);
       else
        {
          /* Max line number to be displayed cannot be more than
@@ -32408,13 +32408,13 @@ after each newline that comes from buffer text.  */);
   Fmake_variable_buffer_local (Qdisplay_line_numbers);
   DEFSYM (Qrelative, "relative");
 
-  DEFVAR_LISP ("display-line-width", Vdisplay_line_width,
+  DEFVAR_LISP ("display-line-number-width", Vdisplay_line_number_width,
     doc: /* Minimum width of space reserved for line number display.
 A positive number means reserve that many columns for line numbers,
 even if the actual number needs less space.
 The default value of nil means compute the space dynamically.
 Any other value is treated as nil.  */);
-  Vdisplay_line_width = Qnil;
+  Vdisplay_line_number_width = Qnil;
 
   DEFVAR_BOOL ("inhibit-eval-during-redisplay", inhibit_eval_during_redisplay,
     doc: /* Non-nil means don't eval Lisp during redisplay.  */);