diff options
| -rw-r--r-- | orgmode-backports.org | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org index b6fdeeb..0bb1385 100644 --- a/orgmode-backports.org +++ b/orgmode-backports.org @@ -54,12 +54,18 @@ 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 [22/24] +** master branch [25/26] :PROPERTIES: :ref: origin/master :exclude-ref: origin/emacs-29 :END: +- [X] 095ec506d03b76155b399fd7b23554279b2cfee0 + + Merge from origin/emacs-29 + Eli Zaretskii + Tue Apr 25 09:57:23 2023 -0400 + - [X] 62e4eb8fcf71a852117b372809bd4a7953f9b679 Fix build when Org's version changes @@ -81,12 +87,18 @@ syncing, but that don't seem appropriate for Org backport. Stefan Monnier Mon Apr 10 21:33:56 2023 -0400 -- [ ] 4f0849a9e6d29e25d23e061bd81bacce9468856d +- [X] 4f0849a9e6d29e25d23e061bd81bacce9468856d Remove unused values in effect context Mattias Engdegård Sun Apr 9 16:45:40 2023 +0200 + This was independently fixed by bugfix's 52dc48050 (Handle compiler + warnings from Emacs master, 2023-04-27), but in slightly different + way. Ported and merged to bugfix to avoid 'emacs-29 -> master' + conflict in the emacs.git: 2ab083dd1 (Merge branch + 'km/from-emacs-master' into bugfix, 2023-04-30) + - [X] 2d1a96e878ef8dd9a27fb360aa6c85b1dc9b856e Merge from origin/emacs-29 @@ -215,11 +227,23 @@ syncing, but that don't seem appropriate for Org backport. Stefan Kangas Wed Nov 30 16:10:39 2022 +0100 -** emacs-29 [124/124] +** emacs-29 [126/126] :PROPERTIES: :ref: origin/emacs-29 :END: +- [X] 0e52beeacead956cdaa7921e911afc2fd29aea61 + + Update to Org 9.6.5-3-g2993f4 + Kyle Meyer + Sun Apr 30 19:36:21 2023 -0400 + +- [X] 2bcf11d0efecd18a1be8bcf0ac1a1dadb14d971a + + * lisp/org/org-macs.el (org--inhibit-version-check): Fix docstring + Stefan Monnier + Sun Apr 30 09:41:13 2023 -0400 + - [X] d80f959beded280ed61623ec36ea2a9ac07cc747 Update to Org 9.6.4-9-g8eb209 |