diff options
Diffstat (limited to 'orgmode-backports.org')
| -rw-r--r-- | orgmode-backports.org | 335 |
1 files changed, 209 insertions, 126 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org index e70c3e1..bd42c2d 100644 --- a/orgmode-backports.org +++ b/orgmode-backports.org @@ -54,12 +54,67 @@ 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 [96/98] +** master branch [19/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 + +- [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 + Stefan Kangas + Fri Dec 13 00:05:08 2024 +0100 + + Covered by Org's b9637ef14 (Remove uses of + `filter-buffer-substring-functions', 2024-12-08). + - [ ] d706be4b345f3e2d242c4f2ffb5e566845b2935d Remove obsolete 'display-comint-buffer-action' (bug#74361) @@ -153,6 +208,159 @@ syncing, but that don't seem appropriate for Org backport. Po Lu Mon Jun 24 09:43:16 2024 +0800 +** emacs-30 [106/106] +:PROPERTIES: +:ref: origin/emacs-30 +:END: + +- [X] cd6e2a082854fb3e73ad98d1d2b945ae482ca4ac + + Fix copyright years by hand + Stefan Kangas + Thu Jan 2 18:44:48 2025 +0100 + + Covered by Org's a1bc565d8 (Update copyright year to 2025, + 2025-01-01). + +- [X] 7fa975adbce3f2ce4ba40ea52110b992a52262b6 + + Update copyright year to 2025 + Stefan Kangas + Thu Jan 2 18:39:42 2025 +0100 + + Covered by Org's a1bc565d8 (Update copyright year to 2025, + 2025-01-01). + +- [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. + Robert Pluim + Fri Sep 13 09:50:01 2024 +0200 + +- [X] 4047072c7d847afb5027dab27e97606a49c1d62e + + Update FSF's address + Stefan Kangas + Mon Sep 2 21:02:09 2024 +0200 + +- [X] 0def396fa8f4806226c4d010daa86ce5f8f9eb13 + + Update to Org 9.7.11 + Kyle Meyer + Sun Sep 1 17:51:22 2024 -0400 + +- [X] 023d387a7bd41298a5c294ce163a49ba55b31ef5 + + Update to Org 9.7.10 + Kyle Meyer + Sun Aug 18 20:54:39 2024 -0400 + +- [X] 88e1ec22f271b127d961896b7dddcd58df289c42 + + Update to Org 9.7.9 + Kyle Meyer + Fri Jul 26 23:58:01 2024 -0400 + +- [X] a79966156633ae1e49e3fef17ff7212c8f35a26f + + Standardize possessive apostrophe usage in manuals, docs, and comments + Stefan Kangas + Thu Jul 25 03:35:18 2024 +0200 + +- [X] 46b192c04b162519a5e88bbf0f465a7c5e1171a9 + + Update to Org 9.7.8-5-gfdf0e0 + Kyle Meyer + Sun Jul 21 23:01:45 2024 -0400 + +- [X] 00adee897ac95912cb9ad6bd8a8d161db71945ac + + ; Fix punctuation in docs + Stefan Kangas + Sun Jul 21 17:35:13 2024 +0200 + +- [X] 34c1094e607c7ec89d66702da7f298b454b7c192 + + ; Fix typo in etc/ORG-NEWS (Bug#72186) + Stefan Kangas + Fri Jul 19 11:17:58 2024 +0200 + +- [X] a6cab228d4d1a82a80eac81b057857a230eef0b5 + + ; Fix typos + Stefan Kangas + Thu Jul 18 11:46:50 2024 +0200 + +- [X] 5ec73eca57c09ad1a33c56dc4cd5b965cfaef063 + + Update to Org 9.7.7-2-gf308d3 + Kyle Meyer + Sun Jul 14 12:30:50 2024 -0400 + +- [X] 6757f8e67d3bdfe338810fc26408a62e7839afe7 + + Checkdoc fixes in Org Mode + Stefan Kangas + Sun Jul 7 17:46:25 2024 +0200 + +- [X] 45a20d781a9b00212609bf0e338bd6b1cc9ea68a + + ; Fix typos in symbols + Stefan Kangas + Sat Jun 29 17:29:38 2024 +0200 + +- [X] 6cc8ffae9a6fa3bbdc71bf5eac3875000c9e7870 + + Update to Org 9.7.5-9-ga091ca + Kyle Meyer + Thu Jun 27 23:55:35 2024 -0400 + +- [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 Update to Org 9.7.4-7-g165319 @@ -680,131 +888,6 @@ syncing, but that don't seem appropriate for Org backport. Stefan Kangas Wed Nov 30 16:10:39 2022 +0100 -** emacs-30 [20/20] -:PROPERTIES: -:ref: origin/emacs-30 -:END: - -- [X] 79f68597abade27939397e0c2a50eec833e64daf - - ; * etc/ORG-NEWS: Fix typo. - Robert Pluim - Fri Sep 13 09:50:01 2024 +0200 - -- [X] 4047072c7d847afb5027dab27e97606a49c1d62e - - Update FSF's address - Stefan Kangas - Mon Sep 2 21:02:09 2024 +0200 - -- [X] 0def396fa8f4806226c4d010daa86ce5f8f9eb13 - - Update to Org 9.7.11 - Kyle Meyer - Sun Sep 1 17:51:22 2024 -0400 - -- [X] 023d387a7bd41298a5c294ce163a49ba55b31ef5 - - Update to Org 9.7.10 - Kyle Meyer - Sun Aug 18 20:54:39 2024 -0400 - -- [X] 88e1ec22f271b127d961896b7dddcd58df289c42 - - Update to Org 9.7.9 - Kyle Meyer - Fri Jul 26 23:58:01 2024 -0400 - -- [X] a79966156633ae1e49e3fef17ff7212c8f35a26f - - Standardize possessive apostrophe usage in manuals, docs, and comments - Stefan Kangas - Thu Jul 25 03:35:18 2024 +0200 - -- [X] 46b192c04b162519a5e88bbf0f465a7c5e1171a9 - - Update to Org 9.7.8-5-gfdf0e0 - Kyle Meyer - Sun Jul 21 23:01:45 2024 -0400 - -- [X] 00adee897ac95912cb9ad6bd8a8d161db71945ac - - ; Fix punctuation in docs - Stefan Kangas - Sun Jul 21 17:35:13 2024 +0200 - -- [X] 34c1094e607c7ec89d66702da7f298b454b7c192 - - ; Fix typo in etc/ORG-NEWS (Bug#72186) - Stefan Kangas - Fri Jul 19 11:17:58 2024 +0200 - -- [X] a6cab228d4d1a82a80eac81b057857a230eef0b5 - - ; Fix typos - Stefan Kangas - Thu Jul 18 11:46:50 2024 +0200 - -- [X] 5ec73eca57c09ad1a33c56dc4cd5b965cfaef063 - - Update to Org 9.7.7-2-gf308d3 - Kyle Meyer - Sun Jul 14 12:30:50 2024 -0400 - -- [X] 6757f8e67d3bdfe338810fc26408a62e7839afe7 - - Checkdoc fixes in Org Mode - Stefan Kangas - Sun Jul 7 17:46:25 2024 +0200 - -- [X] 45a20d781a9b00212609bf0e338bd6b1cc9ea68a - - ; Fix typos in symbols - Stefan Kangas - Sat Jun 29 17:29:38 2024 +0200 - -- [X] 6cc8ffae9a6fa3bbdc71bf5eac3875000c9e7870 - - Update to Org 9.7.5-9-ga091ca - Kyle Meyer - Thu Jun 27 23:55:35 2024 -0400 - -- [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 |