aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--orgmode-backports.org14
1 files changed, 13 insertions, 1 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org
index df738d9..3211a84 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 [49/55]
+** master branch [49/59]
:PROPERTIES:
:ref: origin/master
:END:
@@ -62,6 +62,18 @@ 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.
+- [ ] f8dbefbaa59bb17dd4a2dfa4d9ff560c46785792
+
+ Use `declare` instead of `def-edebug-spec` in most places
+ Stefan Monnier
+ Fri Feb 12 16:08:01 2021 -0500
+
+- [ ] ce35760b19315b634e62e2c64988018189dcdbdc
+
+ ; Minor license statement fixes
+ Stefan Kangas
+ Mon Feb 8 09:10:57 2021 +0100
+
- [ ] bbe88cd82e4bbfd76df06223614ab74d1022c119
Assume font-lock-mode variable is not void