diff options
Diffstat (limited to 'orgmode-backports.org')
| -rw-r--r-- | orgmode-backports.org | 51 |
1 files changed, 49 insertions, 2 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org index 593db84..bb29913 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 [83/83] +** master branch [84/84] :PROPERTIES: :ref: origin/master -:exclude-ref: origin/emacs-29 +:exclude-ref: origin/emacs-30 :END: +- [X] cb3d92da82d11967d728ddb1a0b5c2e8ca618e90 + + Merge from savannah/emacs-30 + Po Lu + Mon Jun 24 09:43:16 2024 +0800 + - [X] 0910f6fe3f701caa478d4aa08d9667316050b977 Update to Org 9.7.4-7-g165319 @@ -587,6 +593,47 @@ syncing, but that don't seem appropriate for Org backport. Stefan Kangas Wed Nov 30 16:10:39 2022 +0100 +** emacs-30 [6/6] +:PROPERTIES: +:ref: origin/emacs-30 +:END: + +- [X] fb11294d4156a4be45080ff286a8ee0d5a3ede9b + + ; Fix typos + Stefan Kangas + Sun Jun 23 16:40:06 2024 +0200 + +- [X] 1313b8966ae5f8d2ebf0d2b418af5b32ccb6a71b + + Merge from origin/emacs-29 + Stefan Kangas + Sat Jun 22 18:44:19 2024 +0200 + +- [X] c645e1d8205f0f0663ec4a2d27575b238c646c7c + + org-link-expand-abbrev: Do not evaluate arbitrary unsafe Elisp code + Ihor Radchenko + Sat Jun 22 00:54:36 2024 +0200 + + Actually on emacs-29 branch, but including with emacs-30 ports for + simplicity (end result is the same). Covered on Org's side by + f4cc61636947b5c2f0afc67174dd369fe3277aa8. + +- [X] a7dff8c53dde18c703f470cde9ad033cffe8c766 + + * lisp/org/ob-lua.el: Minor doc fixes. + Stefan Kangas + Tue Jun 18 21:27:51 2024 +0200 + +- [X] c0eefebabfee011f0ec7631d055e482e4965a24d + + ; Fix typos + Stefan Kangas + Sun Jun 16 22:38:26 2024 +0200 + +- [X] 0910f6fe3f701caa478d4aa08d9667316050b977 + ** emacs-29 [149/149] :PROPERTIES: :ref: origin/emacs-29 |