aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2021-02-14 18:10:48 -0500
committerKyle Meyer <kyle@kyleam.com>2021-02-14 18:10:48 -0500
commit43f07331bb65b686c4aa9d6f8af03262bcf5916a (patch)
tree9c6e2b6a37c5bf32bb9fb9b17a417c2c61e05020
parentbf6afd0fb3aab2f8a14ef6802c56404c8dd7e396 (diff)
downloadorgmode-backport-notes-43f07331bb65b686c4aa9d6f8af03262bcf5916a.tar.gz
orgmode-backports.org: Update
-rw-r--r--orgmode-backports.org27
1 files changed, 14 insertions, 13 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org
index 3211a84..8a2288d 100644
--- a/orgmode-backports.org
+++ b/orgmode-backports.org
@@ -54,33 +54,34 @@ 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 [49/59]
+** master branch [59/59]
: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.
+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 have been merged with Org's master.
-- [ ] f8dbefbaa59bb17dd4a2dfa4d9ff560c46785792
+- [X] f8dbefbaa59bb17dd4a2dfa4d9ff560c46785792
Use `declare` instead of `def-edebug-spec` in most places
Stefan Monnier
Fri Feb 12 16:08:01 2021 -0500
-- [ ] ce35760b19315b634e62e2c64988018189dcdbdc
+- [X] ce35760b19315b634e62e2c64988018189dcdbdc
; Minor license statement fixes
Stefan Kangas
Mon Feb 8 09:10:57 2021 +0100
-- [ ] bbe88cd82e4bbfd76df06223614ab74d1022c119
+- [X] bbe88cd82e4bbfd76df06223614ab74d1022c119
Assume font-lock-mode variable is not void
Stefan Kangas
Fri Feb 5 01:15:02 2021 +0100
-- [ ] a8caa66906b157c9c2b4c4dc1c447b6a9e747c5e
+- [X] a8caa66906b157c9c2b4c4dc1c447b6a9e747c5e
Avoid recommending Google
Stefan Kangas
@@ -94,7 +95,7 @@ Org's maint in case any farther Org->Emacs fixup syncs are needed.
Already covered on Org's side (99eafe378).
-- [ ] dd662fc972a75df71cdaa25a2d763d1592df1eb8
+- [X] dd662fc972a75df71cdaa25a2d763d1592df1eb8
Fix some over-wide docstrings
Stefan Kangas
@@ -124,25 +125,25 @@ Org's maint in case any farther Org->Emacs fixup syncs are needed.
Bastien Guerry
Tue Dec 22 10:29:37 2020 +0100
-- [ ] 34a73666d9559d948815a53b63dc36cc878d5aff
+- [X] 34a73666d9559d948815a53b63dc36cc878d5aff
Shorten some over-wide docstrings in functions and macros
Stefan Kangas
Sat Dec 19 18:21:06 2020 +0100
-- [ ] f88a7897a80ee9129bdc444cafff32d026c4b6d8
+- [X] f88a7897a80ee9129bdc444cafff32d026c4b6d8
Shorten over-wide docstrings in variables
Stefan Kangas
Sat Dec 19 18:21:06 2020 +0100
-- [ ] 5ab5c3898778406103e7183bf41c7d018077092b
+- [X] 5ab5c3898778406103e7183bf41c7d018077092b
Shorten over-wide docstrings in defcustoms
Stefan Kangas
Sat Dec 19 18:21:06 2020 +0100
-- [ ] 64d97212f42bc0305560a0ae2cc2f16a3a851117
+- [X] 64d97212f42bc0305560a0ae2cc2f16a3a851117
Fix over-wide doc strings
Eli Zaretskii
@@ -154,7 +155,7 @@ Org's maint in case any farther Org->Emacs fixup syncs are needed.
Glenn Morris
Fri Dec 18 08:55:06 2020 -0800
-- [ ] 46394dff7f01e7fe4af06a6c344e151af5c3eef4
+- [X] 46394dff7f01e7fe4af06a6c344e151af5c3eef4
Follow good regexp practice
Mattias EngdegÄrd