aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--orgmode-backports.org52
1 files changed, 50 insertions, 2 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org
index 6787663..85a44d0 100644
--- a/orgmode-backports.org
+++ b/orgmode-backports.org
@@ -54,11 +54,53 @@ 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 [58/68]
+** master branch [60/75]
:PROPERTIES:
:ref: origin/master
:END:
+- [ ] 253374f81a13109b73afc8e319ca1fea72f68c72
+
+ Remove some XEmacs compat code from org-mode
+ Stefan Kangas
+ Sat May 14 15:55:20 2022 +0200
+
+- [ ] cc8b6101f4479a80a6af7f9d80c6f9d774a85f40
+
+ Remove some XEmacs compat code from org-mode
+ Stefan Kangas
+ Fri May 13 23:17:16 2022 +0200
+
+- [ ] 2fba71cf1fadc9d681e6be250d152cc156bf6a00
+
+ Fix handling double-click-time nil or t
+ Stefan Kangas
+ Mon May 2 12:03:08 2022 +0200
+
+- [ ] fa1a7ac617619ef015e02e72950eef219ec62336
+
+ Pacify byte compiler etc. on org-compat, org-macs
+ Paul Eggert
+ Thu Apr 28 13:41:35 2022 -0700
+
+- [X] b3023de5431fc308e2a6db61ed4fdd18db785324
+
+ Merge from origin/emacs-28
+ Eli Zaretskii
+ Thu Apr 28 18:37:34 2022 +0300
+
+- [ ] 3abb3681b57d7c8ca7fa808addb0a10b6b109cab
+
+ Use org-time-convert-to-integer instead of by hand
+ Paul Eggert
+ Wed Apr 27 00:30:25 2022 -0700
+
+- [X] 7c1fc2348918a1ad8c61c7519a51042d48d7aa8d
+
+ Update to Org 9.5.3-3-gd54104
+ Kyle Meyer
+ Sun Apr 24 21:07:40 2022 -0400
+
- [ ] 2d71fd3b041506c68b5f1cd1e409e09e25778c34
Further doc string quoting fixes
@@ -471,11 +513,17 @@ syncing, but that don't seem appropriate for Org backport.
dummy marker for emacs-28 split
-** emacs-28 [126/126]
+** emacs-28 [127/127]
:PROPERTIES:
:ref: origin/emacs-28
:END:
+- [X] 7c1fc2348918a1ad8c61c7519a51042d48d7aa8d
+
+ Update to Org 9.5.3-3-gd54104
+ Kyle Meyer
+ Sun Apr 24 21:07:40 2022 -0400
+
- [X] 65c04e7115f329a083a16a364a8400e1685def61
Update to Org 9.5.2-38-g682ccd