From 90472fcf658c2c6f19bb91cb9e6fad01ffb28b42 Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
Date: Sun, 24 Mar 2024 13:50:42 -0400
Subject: orgmode-backports.org: Update

---
 orgmode-backports.org | 80 +++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 78 insertions(+), 2 deletions(-)

diff --git a/orgmode-backports.org b/orgmode-backports.org
index ac9ff41..eb053e0 100644
--- a/orgmode-backports.org
+++ b/orgmode-backports.org
@@ -54,12 +54,54 @@ After resolving the conflict, run
 NOTE: Look for "ONSYNC" for changes that should be considered when
 syncing, but that don't seem appropriate for Org backport.
 
-** master branch [42/67]
+** master branch [42/74]
 :PROPERTIES:
 :ref:              origin/master
 :exclude-ref:      origin/emacs-29
 :END:
 
+- [ ] 6d1c1fca0aa7c5a1ff0254af3f89a34d5309ea0d
+
+  ; Simplify (with-current-buffer (get-buffer ...) ...)
+  Tim Landscheidt
+  Thu Mar 14 12:40:26 2024 +0200
+
+- [ ] 6dacb60bb135dbb002c2ce1c70f70430c5d1bbff
+
+  ; Fix last major-mode-remap-defaults change.
+  Basil L. Contovounesios
+  Mon Mar 4 07:19:22 2024 +0100
+
+- [ ] 2b5d43081a30f816dd38a16c7b5bfbad712a779b
+
+  (major-mode-remap(-defaults)): New var and function (bug#69191)
+  Stefan Monnier
+  Sun Mar 3 23:58:18 2024 -0500
+
+- [ ] 445f376e4e613ebee94d2844926269bfa8793858
+
+  Revert "ox-texinfo:: Require only TEXINFO_DIR_CATEGORY"
+  Stefan Monnier
+  Sun Mar 3 22:09:24 2024 -0500
+
+- [ ] 1a37fe3a66930bb8151a29c722dbe3bebc20d033
+
+  Revert "Set org-macro-templates more lazily"
+  Stefan Monnier
+  Sun Mar 3 22:09:19 2024 -0500
+
+- [ ] 99483e214fdafa76e8001c7009dff13a76c33f32
+
+  Set org-macro-templates more lazily
+  Stefan Monnier
+  Sun Mar 3 16:57:56 2024 -0500
+
+- [ ] 5254c582efb3e7171e955dde653e7530d2d3ffef
+
+  ox-texinfo:: Require only TEXINFO_DIR_CATEGORY
+  Stefan Monnier
+  Sun Mar 3 16:57:56 2024 -0500
+
 - [ ] 862dfef88d8e62d12bac3ca2e44e035a2ff5b298
 
   Pacify more docstring control char warnings
@@ -484,17 +526,51 @@ syncing, but that don't seem appropriate for Org backport.
   Stefan Kangas
   Wed Nov 30 16:10:39 2022 +0100
 
-** emacs-29 [145/145]
+** emacs-29 [149/149]
 :PROPERTIES:
 :ref:      origin/emacs-29
 :END:
 
+- [X] 7a5d7be52c5f0690ee47f30bfad973827261abf2
+
+  org--confirm-resource-safe: Fix prompt when prompting in non-file Org buffers
+  Ihor Radchenko
+  Sun Mar 24 08:41:26 2024 -0400
+
+  Covered by Org's 01f10031b169fb88606f136cf64555ce75b0666c
+
+- [X] 2bc865ace050ff118db43f01457f95f95112b877
+
+  org-file-contents: Consider all remote files unsafe
+  Ihor Radchenko
+  Sun Mar 24 08:41:10 2024 -0400
+
+  Covered by Org's 4255d5dcc0657915f90e4fba7e0a5514cced514d
+
+- [X] 6f9ea396f49cbe38c2173e0a72ba6af3e03b271c
+
+  org-latex-preview: Add protection when `untrusted-content' is non-nil
+  Ihor Radchenko
+  Sun Mar 24 08:40:48 2024 -0400
+
+  Cover by Org's 03635a33557752a2849364974b3944ad9e5d4b96
+
+- [X] befa9fcaae29a6c9a283ba371c3c5234c7f644eb
+
+  org-macro--set-templates: Prevent code evaluation
+  Ihor Radchenko
+  Sun Mar 24 08:38:48 2024 -0400
+
+  Covered by Org's 003ddacf1c8d869b1858181c29ea21b731a8d8d9
+
 - [X] e56f0ef51bfdd0e03e817670754bc813fb3702a2
 
   org: Fix security prompt for downloading remote resource
   Ihor Radchenko
   Sat Feb 17 19:31:28 2024 +0200
 
+  Covered by Org's 56748ea4e28fc78935b29f4446e2b4cbc7376ed1
+
 - [X] 65ba3274652a4dac37f41f872330e391cd511ae1
 
   Revert "Update to Org 9.6.19"
-- 
cgit v1.2.3