4 files changed, 28 insertions, 14 deletions
diff --git a/lisp/button.el b/lisp/button.el
index 244201be2d0..80b73033d68 100644
--- a/lisp/button.el
+++ b/lisp/button.el
@@ -56,10 +56,10 @@
   :group 'basic-faces)
 
 (defvar-keymap button-buffer-map
-  :doc  "Keymap useful for buffers containing buttons.
+  :doc "Keymap useful for buffers containing buttons.
 Mode-specific keymaps may want to use this as their parent keymap."
   "TAB" #'forward-button
-  "C-TAB" #'backward-button
+  "ESC TAB" #'backward-button
   "<backtab>" #'backward-button)
 
 (defvar-keymap button-map
diff --git a/lisp/help.el b/lisp/help.el
index e326ea5d002..9cde65f7975 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -453,10 +453,9 @@ With argument, display info only for the selected version."
 		((< vn 18) "NEWS.1-17")
 		(t (format "NEWS.%d" vn))))
 	 res)
-    (find-file (expand-file-name file data-directory))
-    (setq buffer-read-only t)
-    (emacs-news-mode)
-    (widen)
+    (let ((inhibit-local-variables-regexps '(".*")))
+      (find-file (expand-file-name file data-directory))
+      (emacs-news-view-mode))
     (goto-char (point-min))
     (when (stringp version)
       (when (re-search-forward
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index e03535483a2..77f6b980ac8 100644
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -10416,7 +10416,12 @@ some major modes from being locked under some circumstances.
 ;;; Generated autoloads from textmodes/emacs-news-mode.el
 
 (autoload 'emacs-news-mode "emacs-news-mode" "\
-Major mode for editing and viewind the Emacs NEWS file.
+Major mode for editing the Emacs NEWS file.
+
+\(fn)" t nil)
+
+(autoload 'emacs-news-view-mode "emacs-news-mode" "\
+Major mode for viewing the Emacs NEWS file.
 
 \(fn)" t nil)
 
@@ -27016,6 +27021,8 @@ is non-nil, the command will not ask the user for confirmation.
 NO-CONFIRM is always nil when the command is invoked
 interactively.
 
+Also see the `project-kill-buffers-display-buffer-list' variable.
+
 \(fn &optional NO-CONFIRM)" t nil)
 
 (autoload 'project-remember-project "project" "\
diff --git a/lisp/textmodes/emacs-news-mode.el b/lisp/textmodes/emacs-news-mode.el
index a766352917e..e31a7105b80 100644
--- a/lisp/textmodes/emacs-news-mode.el
+++ b/lisp/textmodes/emacs-news-mode.el
@@ -50,18 +50,26 @@
   `(("^---$" 0 'emacs-news-does-not-need-documentation)
     ("^\\+\\+\\+$" 0 'emacs-news-is-documented)))
 
-;;;###autoload
-(define-derived-mode emacs-news-mode text-mode "NEWS"
-  "Major mode for editing and viewind the Emacs NEWS file."
+(defun emacs-news--mode-common ()
   (setq-local font-lock-defaults '(emacs-news-mode-font-lock-keywords t))
   (setq-local outline-regexp "^\\*+ "
               outline-minor-mode-cycle t
               outline-minor-mode-highlight 'append)
+  (outline-minor-mode))
+
+;;;###autoload
+(define-derived-mode emacs-news-mode text-mode "NEWS"
+  "Major mode for editing the Emacs NEWS file."
   (setq-local fill-paragraph-function #'emacs-news--fill-paragraph)
-  (outline-minor-mode 1)
-  (when buffer-read-only
-    (emacs-news--buttonize)
-    (button-mode)))
+  (emacs-news--mode-common))
+
+;;;###autoload
+(define-derived-mode emacs-news-view-mode special-mode "NEWS"
+  "Major mode for viewing the Emacs NEWS file."
+  (setq buffer-read-only t)
+  (emacs-news--buttonize)
+  (button-mode)
+  (emacs-news--mode-common))
 
 (defun emacs-news--fill-paragraph (&optional justify)
   (cond