diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2025-01-01 23:29:34 -0500 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2025-01-02 22:30:53 -0500 |
| commit | 5b799c13599a1408f2264f31ca5120b3f5b6a1ea (patch) | |
| tree | 66e951e14a00b1196eb4137cc99aec0aae176202 /orgmode-backports.org | |
| parent | 249e035154f1d06e9b0dd91ef81dcf934d4d2a35 (diff) | |
| download | orgmode-backport-notes-5b799c13599a1408f2264f31ca5120b3f5b6a1ea.tar.gz | |
orgmode-backports.org: Update
Diffstat (limited to 'orgmode-backports.org')
| -rw-r--r-- | orgmode-backports.org | 58 |
1 files changed, 56 insertions, 2 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org index 52f47b1..1d10adb 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 [14/16] +** master branch [18/22] :PROPERTIES: :ref: origin/master :exclude-ref: origin/emacs-30 :END: +- [X] b36b1be491e0b19062fa38ee197aa3daeba96415 + + Fix copyright years by hand + Paul Eggert + Wed Jan 1 07:41:51 2025 +0000 + + Covered by Org's a1bc565d8 (Update copyright year to 2025, + 2025-01-01). + +- [X] 4da38c632161867e914b3a13dc760f8019255f94 + + Update copyright year to 2025 + Paul Eggert + Wed Jan 1 07:39:17 2025 +0000 + + Covered by Org's a1bc565d8 (Update copyright year to 2025, + 2025-01-01). + +- [X] af3bbc83600bec6c8621e1b04437dbfdeb329106 + + Merge from origin/emacs-30 + Eli Zaretskii + Sat Dec 28 08:30:31 2024 -0500 + +- [X] 3617940f322c381dee8b3c1f970b8eeda13d1c11 + + Merge from origin/emacs-30 + Eli Zaretskii + Sat Dec 21 07:56:08 2024 -0500 + +- [ ] 3d3c1094604ceb6133a15226aec9b568f7923ee7 + + Make font-lock face variables obsolete + Stefan Kangas + Wed Dec 18 03:48:35 2024 +0100 + +- [ ] 5923d8ebef93075e053cf50e17b86d34731fe777 + + * lisp/org/ox-texinfo.el (org-texinfo-template): Fix direntry format + Stefan Monnier + Fri Dec 13 16:14:45 2024 -0500 + - [X] d1bde7b5cb727d6b0559d99669719d5eb832c186 Don't use obsolete filter-buffer-substring-functions in Org @@ -162,11 +204,23 @@ syncing, but that don't seem appropriate for Org backport. Po Lu Mon Jun 24 09:43:16 2024 +0800 -** emacs-30 [102/102] +** emacs-30 [104/104] :PROPERTIES: :ref: origin/emacs-30 :END: +- [X] 186ea407326166ee4669ce6fe84871c1e16c657c + + Don't start docstrings with "This function" or similar + Stefan Kangas + Thu Dec 26 21:02:45 2024 +0100 + +- [X] 55303a6bc0a06d32ec757b6291d40e8f28565946 + + * lisp/org/ox-texinfo.el (org-texinfo-template): Fix Info format (bug#74844) + Stefan Monnier + Sun Dec 15 17:08:25 2024 -0500 + - [X] 79f68597abade27939397e0c2a50eec833e64daf ; * etc/ORG-NEWS: Fix typo. |