diff options
| -rw-r--r-- | orgmode-backports.org | 77 |
1 files changed, 75 insertions, 2 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org index 051875b..d1d0447 100644 --- a/orgmode-backports.org +++ b/orgmode-backports.org @@ -54,11 +54,62 @@ 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 [33/36] +** master branch [39/46] :PROPERTIES: :ref: origin/master :END: +- [X] dcd76bd48df678d8234b904d7b13c997228519a3 + + Merge from origin/emacs-28 + Eli Zaretskii + Sat Jan 1 07:03:03 2022 -0500 + +- [X] 19dcb237b5b02b36580294ab309124f346a66024 + + ; Add 2022 to copyright years. + Eli Zaretskii + Sat Jan 1 02:45:51 2022 -0500 + +- [ ] 18b680cfd177e877991be2bd70ead628bbdc0aa0 + + Fix bug#52467 by adding a new custom variable 'display-comint-buffer-action' + Sam Steingold + Tue Dec 28 17:28:49 2021 -0500 + + Will likely need to be adjusted for backwards compatibility or + rejected. + +- [X] 4fedbfbfca87849db343c09c4006b52c845f95d2 + + Merge from origin/emacs-28 + Stefan Kangas + Mon Dec 27 06:32:28 2021 +0100 + +- [X] d4e2850b323fdce7b4d658ece50f6071432deae8 + + Update to Org 9.5.2-3-geb9f34 + Kyle Meyer + Sun Dec 26 16:37:26 2021 -0500 + +- [ ] 5f57b41aa612e5f190f5a3c1ea013be114493a03 + + ; Minor license statement fixes + Stefan Kangas + Mon Dec 20 22:31:31 2021 +0100 + +- [X] d745f4b6a0944778c495cd13e11fe096a9bd56f7 + + Merge from origin/emacs-28 + Stefan Kangas + Sun Dec 19 14:02:30 2021 +0100 + +- [X] 5f25852e91f167f99988fbe8d1944fe92d70b903 + + Update to Org 9.5.1-31-ga18849 + Kyle Meyer + Sat Dec 18 13:50:40 2021 -0500 + - [ ] e0ca8f791c2e4396f1e40d86c136ae547b40185d Prefer format-time-string to current-time-zone @@ -285,11 +336,33 @@ syncing, but that don't seem appropriate for Org backport. dummy marker for emacs-28 split -** emacs-28 [115/115] +** emacs-28 [118/118] :PROPERTIES: :ref: origin/emacs-28 :END: +- [X] f475c5823a409356721e49577116521467680ff4 + + ; Copyright year fixes + Glenn Morris + Sat Jan 1 10:02:17 2022 -0800 + + Already covered by update on Org side. + +- [X] 19dcb237b5b02b36580294ab309124f346a66024 + + ; Add 2022 to copyright years. + Eli Zaretskii + Sat Jan 1 02:45:51 2022 -0500 + + Already covered by update on Org side. + +- [X] d4e2850b323fdce7b4d658ece50f6071432deae8 + + Update to Org 9.5.2-3-geb9f34 + Kyle Meyer + Sun Dec 26 16:37:26 2021 -0500 + - [X] 5f25852e91f167f99988fbe8d1944fe92d70b903 Update to Org 9.5.1-31-ga18849 |