[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 6dd4492 1/6: ; Fix earlier NEWS merge
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master 6dd4492 1/6: ; Fix earlier NEWS merge |
Date: |
Thu, 29 Aug 2019 14:14:46 -0400 (EDT) |
branch: master
commit 6dd44926a31b811578b384293f520afa83a2dcad
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
; Fix earlier NEWS merge
---
etc/NEWS | 6 ------
etc/NEWS.26 | 6 ++++++
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/etc/NEWS b/etc/NEWS
index ddaee02..9a3725b 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -191,12 +191,6 @@ after Emacs has finished initialization and is ready for
use.
emacs.service file to eg "~/.config/systemd/user/", you will need to copy
the new version of the file again.)
-+++
-** New option 'help-enable-completion-auto-load'.
-This allows disabling the new feature introduced in Emacs 26.1 which
-loads files during completion of 'C-h f' and 'C-h v' according to
-'definition-prefixes'.
-
* Changes in Emacs 27.1
diff --git a/etc/NEWS.26 b/etc/NEWS.26
index aa583f4..9beb79c 100644
--- a/etc/NEWS.26
+++ b/etc/NEWS.26
@@ -23,6 +23,12 @@ with a prefix argument or by typing 'C-u C-h C-n'.
* Changes in Emacs 26.3
+
++++
+** New option 'help-enable-completion-auto-load'.
+This allows disabling the new feature introduced in Emacs 26.1 which
+loads files during completion of 'C-h f' and 'C-h v' according to
+'definition-prefixes'.
* Editing Changes in Emacs 26.3
- [Emacs-diffs] master updated (9df2852 -> 51cf916), Glenn Morris, 2019/08/29
- [Emacs-diffs] master 5a3e501 2/6: Merge from origin/emacs-26, Glenn Morris, 2019/08/29
- [Emacs-diffs] master 040b305 5/6: ; Merge from origin/emacs-26, Glenn Morris, 2019/08/29
- [Emacs-diffs] master 51cf916 6/6: Merge from origin/emacs-26, Glenn Morris, 2019/08/29
- [Emacs-diffs] master e7f16f0 4/6: Merge from origin/emacs-26, Glenn Morris, 2019/08/29
- [Emacs-diffs] master 8e8ebd4 3/6: ; Merge from origin/emacs-26, Glenn Morris, 2019/08/29
- [Emacs-diffs] master 6dd4492 1/6: ; Fix earlier NEWS merge,
Glenn Morris <=