aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--orgmode-backports.org84
1 files changed, 82 insertions, 2 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org
index 4c332d6..4333e00 100644
--- a/orgmode-backports.org
+++ b/orgmode-backports.org
@@ -54,11 +54,80 @@ 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 [38/38]
+** master branch [43/49]
:PROPERTIES:
:ref: origin/master
:END:
+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.
+
+- [ ] 34a73666d9559d948815a53b63dc36cc878d5aff
+
+ Shorten some over-wide docstrings in functions and macros
+ Stefan Kangas
+ Sat Dec 19 18:21:06 2020 +0100
+
+- [ ] f88a7897a80ee9129bdc444cafff32d026c4b6d8
+
+ Shorten over-wide docstrings in variables
+ Stefan Kangas
+ Sat Dec 19 18:21:06 2020 +0100
+
+- [ ] 5ab5c3898778406103e7183bf41c7d018077092b
+
+ Shorten over-wide docstrings in defcustoms
+ Stefan Kangas
+ Sat Dec 19 18:21:06 2020 +0100
+
+- [ ] 64d97212f42bc0305560a0ae2cc2f16a3a851117
+
+ Fix over-wide doc strings
+ Eli Zaretskii
+ Sat Dec 19 13:18:11 2020 +0200
+
+- [X] 8d2d8d7f53055d93ed2d8a435533c9a6a6303725
+
+ Merge from origin/emacs-27
+ Glenn Morris
+ Fri Dec 18 08:55:06 2020 -0800
+
+- [ ] 46394dff7f01e7fe4af06a6c344e151af5c3eef4
+
+ Follow good regexp practice
+ Mattias EngdegÄrd
+ Fri Dec 18 14:35:09 2020 +0100
+
+- [ ] 5ada3eecec79703a84e2f2c38cae16ef4b2600cc
+
+ * lisp/org/org-refile.el (org-copy): Fix missing obsoletion version
+ Stefan Monnier
+ Thu Dec 17 18:21:47 2020 -0500
+
+- [X] 7cacf5da47d1f88bbaef07e10841d1f6bfe2e471
+
+ Update to Org 9.4.3
+ Bastien Guerry
+ Wed Dec 16 19:17:58 2020 +0100
+
+- [X] cbdd48a07be5401177807ed6e6b8ec16c1b5e004
+
+ Merge from origin/emacs-27
+ Glenn Morris
+ Tue Dec 15 09:24:21 2020 -0800
+
+- [X] 2dbc95063b5ee3d48aceff05f89e63a134df86ed
+
+ Update to Org 9.4.2
+ Bastien Guerry
+ Sun Dec 13 22:26:51 2020 +0100
+
+- [X] f22856a5c54d99867cd24c08a14bbda23d5c6229
+
+ Update to Org 9.4.1
+ Bastien Guerry
+ Sun Dec 13 13:44:15 2020 +0100
+
- [X] 0a4aa2894297c0fd9e735328bbb60b427e0ba5d4
Remove redundant requires of 'font-lock'
@@ -299,11 +368,22 @@ syncing, but that don't seem appropriate for Org backport.
- [X] b0f20651e3cbb8a66f11ffae4c18634019c20cd4
-** emacs 27 branch [192/192]
+** emacs 27 branch [194/194]
:PROPERTIES:
:ref: origin/emacs-27
:END:
+- [X] 7f8793e5f1c69cf9311479e69d18a62ae87e35ce
+
+ Update to Org 9.4.4
+ Bastien Guerry
+ Tue Dec 22 10:29:37 2020 +0100
+
+- [X] 7cacf5da47d1f88bbaef07e10841d1f6bfe2e471
+
+ Update to Org 9.4.3
+ Bastien Guerry
+ Wed Dec 16 19:17:58 2020 +0100
- [X] 2dbc95063b5ee3d48aceff05f89e63a134df86ed