From ff389163ee8d2b3af3b92dabc3d58a9c9ed3b94f Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefankangas@gmail.com>
Date: Sat, 22 Jun 2024 18:49:14 +0200
Subject: [PATCH] Manually merge NEWS.29 from emacs-29

* etc/NEWS.29: Manually merge from etc/NEWS on the 'emacs-29' branch.
---
 etc/NEWS.29 | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/etc/NEWS.29 b/etc/NEWS.29
index 470a758afb9..1e381034ada 100644
--- a/etc/NEWS.29
+++ b/etc/NEWS.29
@@ -15,6 +15,14 @@ in older Emacs versions.
 You can narrow news to a specific version by calling 'view-emacs-news'
 with a prefix argument or by typing 'C-u C-h C-n'.
 
+
+* Changes in Emacs 29.4
+Emacs 29.4 is an emergency bugfix release intended to fix the
+security vulnerability described below.
+
+** Arbitrary shell commands are no longer run when turning on Org mode.
+This is for security reasons, to avoid running malicious commands.
+
 
 * Changes in Emacs 29.3
 Emacs 29.3 is an emergency bugfix release intended to fix several