From 461fda5398d67b7b43a437255552336d94d0a085 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Wed, 1 Jan 2025 23:57:09 -0500 Subject: orgmode-backports.org: Update --- orgmode-backports.org | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'orgmode-backports.org') diff --git a/orgmode-backports.org b/orgmode-backports.org index 1d10adb..2d87d58 100644 --- a/orgmode-backports.org +++ b/orgmode-backports.org @@ -54,7 +54,7 @@ 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 [18/22] +** master branch [19/22] :PROPERTIES: :ref: origin/master :exclude-ref: origin/emacs-30 @@ -96,12 +96,16 @@ syncing, but that don't seem appropriate for Org backport. Stefan Kangas Wed Dec 18 03:48:35 2024 +0100 -- [ ] 5923d8ebef93075e053cf50e17b86d34731fe777 +- [X] 5923d8ebef93075e053cf50e17b86d34731fe777 * lisp/org/ox-texinfo.el (org-texinfo-template): Fix direntry format Stefan Monnier Fri Dec 13 16:14:45 2024 -0500 + This was overwritten by the change in emacs-30's 55303a6bc0a + (2024-12-15) with 3617940f322 (Merge from origin/emacs-30, + 2024-12-21). + - [X] d1bde7b5cb727d6b0559d99669719d5eb832c186 Don't use obsolete filter-buffer-substring-functions in Org -- cgit v1.2.3