aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2020-12-28 09:37:39 -0500
committerKyle Meyer <kyle@kyleam.com>2020-12-28 09:37:39 -0500
commitf2877bc17bd4025a3d4e0c6038081ed9dc627296 (patch)
treee3d4df065c008e3b5c174ca1860ec4d5e9104943
parentc01a7a185c0f006eb7b90333491fb455177cddeb (diff)
downloadorgmode-backport-notes-f2877bc17bd4025a3d4e0c6038081ed9dc627296.tar.gz
orgmode-backports.org: Update
-rw-r--r--orgmode-backports.org37
1 files changed, 35 insertions, 2 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org
index 4333e00..764f832 100644
--- a/orgmode-backports.org
+++ b/orgmode-backports.org
@@ -54,7 +54,7 @@ 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 [43/49]
+** master branch [47/53]
:PROPERTIES:
:ref: origin/master
:END:
@@ -62,6 +62,30 @@ syncing, but that don't seem appropriate for Org backport.
Emacs 27 is in pretest phase; holding on applying commits here to
Org's maint in case any farther Org->Emacs fixup syncs are needed.
+- [X] 90ec81f5b243b6b7b3ebe2de394b20e8078ebc96
+
+ Merge from origin/emacs-27
+ Glenn Morris
+ Fri Dec 25 10:36:48 2020 -0800
+
+- [X] 2e20749e57164982df962c8f373e98bb40dd7d19
+
+ Merge from origin/emacs-27
+ Glenn Morris
+ Fri Dec 25 10:36:48 2020 -0800
+
+- [X] b242bbb073b501f7a4d4569c2d70cde522abbea3
+
+ ; lisp/org/org.el: Fix Version header.
+ Glenn Morris
+ Fri Dec 25 10:36:25 2020 -0800
+
+- [X] 7f8793e5f1c69cf9311479e69d18a62ae87e35ce
+
+ Update to Org 9.4.4
+ Bastien Guerry
+ Tue Dec 22 10:29:37 2020 +0100
+
- [ ] 34a73666d9559d948815a53b63dc36cc878d5aff
Shorten some over-wide docstrings in functions and macros
@@ -368,11 +392,20 @@ Org's maint in case any farther Org->Emacs fixup syncs are needed.
- [X] b0f20651e3cbb8a66f11ffae4c18634019c20cd4
-** emacs 27 branch [194/194]
+** emacs 27 branch [195/195]
:PROPERTIES:
:ref: origin/emacs-27
:END:
+- [X] b242bbb073b501f7a4d4569c2d70cde522abbea3
+
+ ; lisp/org/org.el: Fix Version header.
+ Glenn Morris
+ Fri Dec 25 10:36:25 2020 -0800
+
+ Must have been issue on sync because post-image is already the state
+ on Org's side (maint and emacs-sync branch).
+
- [X] 7f8793e5f1c69cf9311479e69d18a62ae87e35ce
Update to Org 9.4.4