aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--orgmode-backports.org24
1 files changed, 20 insertions, 4 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org
index 3a198f0..4247f93 100644
--- a/orgmode-backports.org
+++ b/orgmode-backports.org
@@ -54,11 +54,23 @@ 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 [31/34]
+** master branch [33/36]
:PROPERTIES:
:ref: origin/master
:END:
+- [X] 2d116c432d2a561fac69916d78b7a70dd6144ac7
+
+ Merge from origin/emacs-28
+ Stefan Kangas
+ Sun Dec 12 06:31:07 2021 +0100
+
+- [X] 30dd5c9acc3b3b95ef784549b5e3ff8136a23854
+
+ Update to Org 9.5.1-25-g9ca3bc
+ Kyle Meyer
+ Sat Dec 11 12:31:13 2021 -0500
+
- [X] d601fd4692e0be3c9ee9b247c8a7bc5b2499f0eb
Merge from origin/emacs-28
@@ -261,11 +273,17 @@ syncing, but that don't seem appropriate for Org backport.
dummy marker for emacs-28 split
-** emacs-28 [113/113]
+** emacs-28 [114/114]
:PROPERTIES:
:ref: origin/emacs-28
:END:
+- [X] 30dd5c9acc3b3b95ef784549b5e3ff8136a23854
+
+ Update to Org 9.5.1-25-g9ca3bc
+ Kyle Meyer
+ Sat Dec 11 12:31:13 2021 -0500
+
- [X] 26fb4168b884eeb910580c42e87efb73399019c9
; Prefer HTTPS in more URLs
@@ -497,7 +515,6 @@ syncing, but that don't seem appropriate for Org backport.
Independently applied to master in 1a5a326f1. Also applied to
km/from-emacs-master.
-
- [X] 5746fd57ab7c9d27bcc6220f2b9faaba2982deba
* lisp/org/org-mouse.el: Make use of lexical scoping
@@ -765,7 +782,6 @@ syncing, but that don't seem appropriate for Org backport.
- [X] 430eb2f850b26f7df8473de4d929b5665673a0a2
-
Remove Emacs 20 compat code from org.el
Stefan Kangas
Fri Nov 20 16:11:33 2020 +0100