aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--orgmode-backports.org44
1 files changed, 39 insertions, 5 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org
index c4c5ff0..135a517 100644
--- a/orgmode-backports.org
+++ b/orgmode-backports.org
@@ -54,15 +54,49 @@ 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 [89/89]
+** master branch [1/1]
:PROPERTIES:
:ref: origin/master
:END:
-Holding on applying commits here to Org's maint in case any more
-Org->Emacs fixup syncs are needed before 27.2 release. These are in
-km/from-emacs-master branch and will be periodically merged with Org's
-master.
+- [X] bd3a1c3134a130ca8edf4c13c44a8c2323ef2c90
+
+ dummy marker for emacs-28 split
+
+** emacs-28 [94/94]
+:PROPERTIES:
+:ref: origin/emacs-28
+:END:
+
+- [X] 2075411edbad954c0fdf2aa141757d834a6708b7
+
+ Fix regexp snags in org
+ Mattias EngdegÄrd
+ Thu Sep 30 17:16:41 2021 +0200
+
+- [X] 58102466e32d4dd9c7d816cdc3f4595a2145f332
+
+ org-element: use correct function
+ Mattias EngdegÄrd
+ Thu Sep 30 17:16:25 2021 +0200
+
+- [X] b5e3cc3bc597d56dfe09ee500717344649ea0354
+
+ * lisp/org/ob-julia.el: Use lexical-binding
+ Stefan Monnier
+ Thu Sep 30 10:02:29 2021 -0400
+
+- [X] a5b761ec334cded8252e81c3887142a46752ec6a
+
+ * lisp/org/ox-koma-letter.el: Use lexical-binding
+ Stefan Monnier
+ Thu Sep 30 09:58:04 2021 -0400
+
+- [X] bf9ec3d91a79414deac039f7bf83352a9b0a9a85
+
+ Update to Org 9.5
+ Kyle Meyer
+ Wed Sep 29 23:21:21 2021 -0400
- [X] c78e16962e63895d340f80cf245fad568a7da770