aboutsummaryrefslogtreecommitdiff
path: root/orgmode-backports.org
diff options
context:
space:
mode:
Diffstat (limited to 'orgmode-backports.org')
-rw-r--r--orgmode-backports.org8
1 files changed, 7 insertions, 1 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org
index 806a449..0f857e6 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 [80/80]
+** master branch [81/81]
:PROPERTIES:
:ref: origin/master
:END:
@@ -64,6 +64,12 @@ Org->Emacs fixup syncs are needed before 27.2 release. These are in
km/from-emacs-master branch and will be periodically merged with Org's
master.
+- [X] 6a3920c07eaae58408dd27e7db22bff7ad4d1f80
+
+ Make `q' in `org-agenda' work even with `debug-on-error' set
+ Lars Ingebrigtsen
+ Sat Aug 7 12:55:39 2021 +0200
+
- [X] 8d957f2dd8b026ec0d7178222c0e5d9f82a2b91e
Merge from origin/emacs-27