Merge from origin/emacs-26

3673770 (origin/emacs-26) Fix vertical-motion with 'visual' line-numb...
d8bff53 ; CONTRIBUTE: Add a couple of nits.

2 files changed, 8 insertions, 2 deletions

diff --git a/CONTRIBUTE b/CONTRIBUTE
index c324375bb07..c4f424ce560 100644
--- a/CONTRIBUTE
+++ b/CONTRIBUTE
@@ -78,9 +78,16 @@ admin/notes/bug-triage.
 ** Documenting your changes
 
 Any change that matters to end-users should have an entry in etc/NEWS.
+Try to start each NEWS entry with a sentence that summarizes the entry
+and takes just one line -- this will allow to read NEWS in Outline
+mode after hiding the body of each entry.
 
 Doc-strings should be updated together with the code.
 
+New defcustom's should always have a ':version' tag stating the first
+Emacs version in which they will appear.  Likewise with defcustom's
+whose value is changed -- update their ':version' tag.
+
 Think about whether your change requires updating the manuals.  If you
 know it does not, mark the NEWS entry with "---".  If you know
 that *all* the necessary documentation updates have been made as part
diff --git a/src/indent.c b/src/indent.c
index bcffa0d11e5..9c751bc30b5 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -2147,8 +2147,7 @@ whether or not it is currently displayed in some window.  */)
          will sometimes err by one column.  */
       int lnum_width = 0;
       int lnum_pixel_width = 0;
-      if (!NILP (Vdisplay_line_numbers)
-          && !EQ (Vdisplay_line_numbers, Qvisual))
+      if (!NILP (Vdisplay_line_numbers))
         line_number_display_width (w, &lnum_width, &lnum_pixel_width);
       SET_TEXT_POS (pt, PT, PT_BYTE);
       itdata = bidi_shelve_cache ();