From 6dd44926a31b811578b384293f520afa83a2dcad Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 29 Aug 2019 11:04:18 -0700 Subject: [PATCH] ; 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 ddaee02e268..9a3725b033c 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 aa583f47c61..9beb79c150a 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 -- 2.39.2