diff options
| -rw-r--r-- | orgmode-backports.org | 45 |
1 files changed, 42 insertions, 3 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org index d017a16..b89be78 100644 --- a/orgmode-backports.org +++ b/orgmode-backports.org @@ -54,13 +54,40 @@ 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 [36/57] +** master branch [38/61] :PROPERTIES: :ref: origin/master :exclude-ref: origin/emacs-29 :END: -- [ ] 486094126ba77e45c50acb87f5ad3e4147608446 +- [ ] 0f3be9596fb3cf2f5e8f10fe2b3ef59546de98bb + + ; Prefer finder keyword "text" to deprecated keyword "wp" + Stefan Kangas + Sat Dec 30 18:14:40 2023 +0100 + +- [ ] 40dafa9af0ae3b1826409ebed80cb65f56591ffb + + * lisp/org/org-src.el (org-src-font-lock-fontify-block): Fix point-min /= 1 + Stefan Monnier + Wed Dec 20 17:50:09 2023 -0500 + +- [ ] a1d3862c6240805bde997bb57f60fceb0fbccb85 + + Merge from origin/emacs-29 + Eli Zaretskii + Sat Dec 16 09:17:51 2023 -0500 + + Resolves ox-beamer.el conflict with 2b311a47dd0 (Assume that + font-lock is preloaded, 2023-08-25). + +- [X] 0da2a4650cdac008ac9a50ec8a7729093632a6a8 + + Merge from origin/emacs-29 + Eli Zaretskii + Sun Dec 10 10:35:54 2023 -0500 + +- [X] 486094126ba77e45c50acb87f5ad3e4147608446 Merge from origin/emacs-29 Eli Zaretskii @@ -421,11 +448,23 @@ syncing, but that don't seem appropriate for Org backport. Stefan Kangas Wed Nov 30 16:10:39 2022 +0100 -** emacs-29 [136/136] +** emacs-29 [138/138] :PROPERTIES: :ref: origin/emacs-29 :END: +- [X] 55555a6a0d1d76468f8327972b3cb067b9e35f24 + + org-protocol: Minor copy-edits to Commentary + Stefan Kangas + Sat Dec 30 17:53:53 2023 +0100 + +- [X] 23c06c7c3080d83ae0eee70c70fb50587339a63e + + Update to Org 9.6.13 + Kyle Meyer + Sun Dec 10 11:16:58 2023 -0500 + - [X] 020aff95fa3e503387a7f9b240e0f7e9f2f054ae ; Fix typos in ChangeLog files |