aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--orgmode-backports.org34
1 files changed, 32 insertions, 2 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org
index efdd694..6787663 100644
--- a/orgmode-backports.org
+++ b/orgmode-backports.org
@@ -54,11 +54,35 @@ 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 [56/64]
+** master branch [58/68]
:PROPERTIES:
:ref: origin/master
:END:
+- [ ] 2d71fd3b041506c68b5f1cd1e409e09e25778c34
+
+ Further doc string quoting fixes
+ Lars Ingebrigtsen
+ Fri Apr 22 17:16:42 2022 +0200
+
+- [ ] bbf389ea6deab229ba18dc519fe712ec982609d1
+
+ Audit quoting the quote character in doc strings
+ Lars Ingebrigtsen
+ Fri Apr 22 16:17:22 2022 +0200
+
+- [X] 6cd43d62055c9ec27cacdcaff13d4a52b7efdff2
+
+ Merge from origin/emacs-28
+ Paul Eggert
+ Sun Apr 17 13:10:19 2022 -0700
+
+- [X] 65c04e7115f329a083a16a364a8400e1685def61
+
+ Update to Org 9.5.2-38-g682ccd
+ Kyle Meyer
+ Sun Apr 17 15:30:39 2022 -0400
+
- [ ] 8ef37913d3be5ff518018acb6b0144d6e559b5ba
Port Org encode-time usage back to Emacs 25
@@ -447,11 +471,17 @@ syncing, but that don't seem appropriate for Org backport.
dummy marker for emacs-28 split
-** emacs-28 [125/125]
+** emacs-28 [126/126]
:PROPERTIES:
:ref: origin/emacs-28
:END:
+- [X] 65c04e7115f329a083a16a364a8400e1685def61
+
+ Update to Org 9.5.2-38-g682ccd
+ Kyle Meyer
+ Sun Apr 17 15:30:39 2022 -0400
+
- [X] f15922a57cd6177c9c945d3390a6b9918883415d
Update to Org 9.5.2-25-gaf6f12