[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 1d9d35a 11/11: Merge from origin/emacs-26
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master 1d9d35a 11/11: Merge from origin/emacs-26 |
Date: |
Mon, 18 Jun 2018 15:18:56 -0400 (EDT) |
branch: master
commit 1d9d35a4e8d6339e064bfe5b1655544e851128ff
Merge: 96dd452 3673770
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
Merge from origin/emacs-26
3673770 (origin/emacs-26) Fix vertical-motion with 'visual' line-numb...
d8bff53 ; CONTRIBUTE: Add a couple of nits.
---
CONTRIBUTE | 7 +++++++
src/indent.c | 3 +--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/CONTRIBUTE b/CONTRIBUTE
index c324375..c4f424c 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 bcffa0d..9c751bc 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 ();
- [Emacs-diffs] master updated (bfc1dfd -> 1d9d35a), Glenn Morris, 2018/06/18
- [Emacs-diffs] master 012338f 01/11: Merge from origin/emacs-26, Glenn Morris, 2018/06/18
- [Emacs-diffs] master 0f7c3ba 04/11: ; Merge from origin/emacs-26, Glenn Morris, 2018/06/18
- [Emacs-diffs] master 2c33577 06/11: ; Merge from origin/emacs-26, Glenn Morris, 2018/06/18
- [Emacs-diffs] master 96dd452 10/11: ; Merge from origin/emacs-26, Glenn Morris, 2018/06/18
- [Emacs-diffs] master 988b53e 09/11: Merge from origin/emacs-26, Glenn Morris, 2018/06/18
- [Emacs-diffs] master e347754 02/11: ; Merge from origin/emacs-26, Glenn Morris, 2018/06/18
- [Emacs-diffs] master ef02c9f 03/11: Merge from origin/emacs-26, Glenn Morris, 2018/06/18
- [Emacs-diffs] master 72b20dd 05/11: Merge from origin/emacs-26, Glenn Morris, 2018/06/18
- [Emacs-diffs] master 2f477cb 08/11: ; Merge from origin/emacs-26, Glenn Morris, 2018/06/18
- [Emacs-diffs] master 1d9d35a 11/11: Merge from origin/emacs-26,
Glenn Morris <=
- [Emacs-diffs] master b455a1b 07/11: Merge from origin/emacs-26, Glenn Morris, 2018/06/18