aboutsummaryrefslogtreecommitdiff
path: root/orgmode-backports.org
diff options
context:
space:
mode:
Diffstat (limited to 'orgmode-backports.org')
-rw-r--r--orgmode-backports.org25
1 files changed, 23 insertions, 2 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org
index cd9fc63..55b4f03 100644
--- a/orgmode-backports.org
+++ b/orgmode-backports.org
@@ -54,18 +54,39 @@ 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 [78/79]
+** master branch [82/82]
:PROPERTIES:
:ref: origin/master
:exclude-ref: origin/emacs-29
:END:
-- [ ] 8d1d9798f77e837e21252bdd5da961dea4276d86
+- [X] d3524560ee3cb075125f0af158d4af01cb2ab546
+
+ * lisp/org/ox.el (org-export-filters-alist): Don't define as constant...
+ Stefan Monnier
+ Mon Jun 10 10:58:46 2024 -0400
+
+- [X] 331573e40731d6635acd366694493c26b480c230
+
+ Org: fix mistakes in regexp, skip set and doc string
+ Mattias EngdegÄrd
+ Mon Jun 10 14:07:07 2024 +0200
+
+- [X] bd80717d8e762c7559f66d297cdb6144e3f7f958
+
+ Re-enable TTY glyph production for batch mode frames on Android
+ Po Lu
+ Mon Jun 10 11:56:24 2024 +0800
+
+- [X] 8d1d9798f77e837e21252bdd5da961dea4276d86
Fix bootstrap of org.texi
Po Lu
Mon Jun 10 08:37:51 2024 +0800
+ Reverted by next commit, aside from indentation fix. Covered by
+ Org's ce350490cae7c29614b4a5763c7697f222f26dd4.
+
- [X] 77d0eed74e1d934e28f364cb3adb06365e71335e
; Fix typos