aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--orgmode-backports.org72
1 files changed, 38 insertions, 34 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org
index 354426b..84da1e0 100644
--- a/orgmode-backports.org
+++ b/orgmode-backports.org
@@ -54,67 +54,69 @@ 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 [43/76]
+** master branch [76/76]
:PROPERTIES:
:ref: origin/master
:exclude-ref: origin/emacs-29
:END:
-- [ ] e74eedaa2e34d7fd1c3ba9bd2632468bf36d5774
+- [X] e74eedaa2e34d7fd1c3ba9bd2632468bf36d5774
nxml-mode: Add schemas for Mono/.NET related files
Jostein Kjønigsen
Sat May 18 21:36:47 2024 +0200
+ ONSYNC: etc/schema/schemas.xml change, ported to emacs-sync branch
+
- [X] cd60fa42f6803d4d34dedfaea3d1ed5c16349670
Merge from origin/emacs-29
Eli Zaretskii
Sat Mar 30 04:35:24 2024 -0400
-- [ ] 6d1c1fca0aa7c5a1ff0254af3f89a34d5309ea0d
+- [X] 6d1c1fca0aa7c5a1ff0254af3f89a34d5309ea0d
; Simplify (with-current-buffer (get-buffer ...) ...)
Tim Landscheidt
Thu Mar 14 12:40:26 2024 +0200
-- [ ] 6dacb60bb135dbb002c2ce1c70f70430c5d1bbff
+- [X] 6dacb60bb135dbb002c2ce1c70f70430c5d1bbff
; Fix last major-mode-remap-defaults change.
Basil L. Contovounesios
Mon Mar 4 07:19:22 2024 +0100
-- [ ] 2b5d43081a30f816dd38a16c7b5bfbad712a779b
+- [X] 2b5d43081a30f816dd38a16c7b5bfbad712a779b
(major-mode-remap(-defaults)): New var and function (bug#69191)
Stefan Monnier
Sun Mar 3 23:58:18 2024 -0500
-- [ ] 445f376e4e613ebee94d2844926269bfa8793858
+- [X] 445f376e4e613ebee94d2844926269bfa8793858
Revert "ox-texinfo:: Require only TEXINFO_DIR_CATEGORY"
Stefan Monnier
Sun Mar 3 22:09:24 2024 -0500
-- [ ] 1a37fe3a66930bb8151a29c722dbe3bebc20d033
+- [X] 1a37fe3a66930bb8151a29c722dbe3bebc20d033
Revert "Set org-macro-templates more lazily"
Stefan Monnier
Sun Mar 3 22:09:19 2024 -0500
-- [ ] 99483e214fdafa76e8001c7009dff13a76c33f32
+- [X] 99483e214fdafa76e8001c7009dff13a76c33f32
Set org-macro-templates more lazily
Stefan Monnier
Sun Mar 3 16:57:56 2024 -0500
-- [ ] 5254c582efb3e7171e955dde653e7530d2d3ffef
+- [X] 5254c582efb3e7171e955dde653e7530d2d3ffef
ox-texinfo:: Require only TEXINFO_DIR_CATEGORY
Stefan Monnier
Sun Mar 3 16:57:56 2024 -0500
-- [ ] 862dfef88d8e62d12bac3ca2e44e035a2ff5b298
+- [X] 862dfef88d8e62d12bac3ca2e44e035a2ff5b298
Pacify more docstring control char warnings
Robert Pluim
@@ -126,12 +128,14 @@ syncing, but that don't seem appropriate for Org backport.
Eli Zaretskii
Sat Feb 24 06:35:16 2024 -0500
-- [ ] 9364c28959a5b00e8ffd5d0d283ff0c0042f1bb0
+- [X] 9364c28959a5b00e8ffd5d0d283ff0c0042f1bb0
; Fix typos in symbol names
Stefan Kangas
Sun Jan 21 15:28:06 2024 +0100
+ Fixes typo from 725a3f32f8ba78ac5fffcd03be5b82cbc2c1b275
+
- [X] 1b31a784bfb56c3c5d138d906601428ebd3e737b
Merge from origin/emacs-29
@@ -150,19 +154,19 @@ syncing, but that don't seem appropriate for Org backport.
Po Lu
Tue Jan 2 10:19:48 2024 +0800
-- [ ] 0f3be9596fb3cf2f5e8f10fe2b3ef59546de98bb
+- [X] 0f3be9596fb3cf2f5e8f10fe2b3ef59546de98bb
; Prefer finder keyword "text" to deprecated keyword "wp"
Stefan Kangas
Sat Dec 30 18:14:40 2023 +0100
-- [ ] 40dafa9af0ae3b1826409ebed80cb65f56591ffb
+- [X] 40dafa9af0ae3b1826409ebed80cb65f56591ffb
* lisp/org/org-src.el (org-src-font-lock-fontify-block): Fix point-min /= 1
Stefan Monnier
Wed Dec 20 17:50:09 2023 -0500
-- [ ] a1d3862c6240805bde997bb57f60fceb0fbccb85
+- [X] a1d3862c6240805bde997bb57f60fceb0fbccb85
Merge from origin/emacs-29
Eli Zaretskii
@@ -189,13 +193,13 @@ syncing, but that don't seem appropriate for Org backport.
Eli Zaretskii
Sat Nov 11 05:31:52 2023 -0500
-- [ ] 67977ae5974e54d34034aa7990cf22dd162c179b
+- [X] 67977ae5974e54d34034aa7990cf22dd162c179b
Eliminate some nested repetitions in regexps
Mattias Engdegård
Sun Oct 29 17:40:36 2023 +0100
-- [ ] 2e19e11638339d0ae97958547bd87b4b15c2ee52
+- [X] 2e19e11638339d0ae97958547bd87b4b15c2ee52
Don't use obsolete `sleep-for` argument
Stefan Kangas
@@ -207,7 +211,7 @@ syncing, but that don't seem appropriate for Org backport.
Michael Albinus
Fri Oct 13 16:18:06 2023 +0200
-- [ ] 6b2219cd2744c711580cc7226554e69c8cec8247
+- [X] 6b2219cd2744c711580cc7226554e69c8cec8247
; Add several "duplicate value in `cond`" FIXMEs
Stefan Kangas
@@ -219,25 +223,25 @@ syncing, but that don't seem appropriate for Org backport.
Eli Zaretskii
Sat Sep 23 09:32:57 2023 -0400
-- [ ] e0070fc574a8621b2fbb1aaca678b974a3dc5fd5
+- [X] e0070fc574a8621b2fbb1aaca678b974a3dc5fd5
Improve org-babel-execute:eshell docstring
Stefan Kangas
Sun Sep 17 16:57:25 2023 +0200
-- [ ] 1e270e580d3bb9ca1b3766a296611f76ec13f6f1
+- [X] 1e270e580d3bb9ca1b3766a296611f76ec13f6f1
; Grammar fixes ("allow to" et al)
Stefan Kangas
Sun Sep 17 16:49:21 2023 +0200
-- [ ] ff87aecf8554042b043467a7aaff1a758df0bbae
+- [X] ff87aecf8554042b043467a7aaff1a758df0bbae
Address "Useless clause following default cond clause" warnings
Stefan Monnier
Tue Sep 12 12:59:03 2023 -0400
-- [ ] c0400151f8880862d460f0e47be287237a6182ad
+- [X] c0400151f8880862d460f0e47be287237a6182ad
Correct many instances of ``allows to''
Po Lu
@@ -255,37 +259,37 @@ syncing, but that don't seem appropriate for Org backport.
Eli Zaretskii
Sat Sep 2 04:28:17 2023 -0400
-- [ ] 64269125156836060eb95b28b01b877c74e800d8
+- [X] 64269125156836060eb95b28b01b877c74e800d8
; Delete redundant defvars; font-lock is preloaded
Stefan Kangas
Fri Aug 25 23:54:51 2023 +0200
-- [ ] 2b311a47dd0cde82fb9d32c303f13700cae4f0b3
+- [X] 2b311a47dd0cde82fb9d32c303f13700cae4f0b3
Assume that font-lock is preloaded
Stefan Kangas
Fri Aug 25 20:35:38 2023 +0200
-- [ ] 73b24a41412eb97a9451a8310da0ebab379f7534
+- [X] 73b24a41412eb97a9451a8310da0ebab379f7534
Make org-mouse compatible with touch screen event emulation
Po Lu
Wed Aug 23 09:56:35 2023 +0800
-- [ ] 4f714dc08137d36d0d1e886814008f2abe5712c0
+- [X] 4f714dc08137d36d0d1e886814008f2abe5712c0
Support desktop notifications on Android
Po Lu
Sun Aug 20 20:25:53 2023 +0800
-- [ ] 5856ea5e4e897f4cb5cd1c3c28d14b335fe5cf54
+- [X] 5856ea5e4e897f4cb5cd1c3c28d14b335fe5cf54
Introduce support for Desktop Notifications on Haiku
Po Lu
Thu Aug 17 08:34:32 2023 +0000
-- [ ] 1ad318cf2ae22d945f8bfcd61981d619467a36da
+- [X] 1ad318cf2ae22d945f8bfcd61981d619467a36da
ob-tangle.el: fix unintended range in regexp
Mattias Engdegård
@@ -305,19 +309,19 @@ syncing, but that don't seem appropriate for Org backport.
Based on diff of c75c79971975 (merge of feature/android to master)
and a5bbc51f4745, only 9082b4e6ee27 (below) touched Org files.
-- [ ] 9082b4e6ee27b995cbb61668cb437d7b91c7f5f8
+- [X] 9082b4e6ee27b995cbb61668cb437d7b91c7f5f8
Make binaries distributed with Emacs work on Android
Po Lu
Tue Jan 24 21:37:22 2023 +0800
-- [ ] c75c7997197502189023c9f47140474fa7fd719e
+- [X] c75c7997197502189023c9f47140474fa7fd719e
; Fix http/https thinko in org manual
Stefan Kangas
Fri Aug 4 09:57:27 2023 +0200
-- [ ] 0910230be6ee858d8d8849a1fc9559bfd163dc38
+- [X] 0910230be6ee858d8d8849a1fc9559bfd163dc38
; Prefer HTTPS to HTTP in more links
Stefan Kangas
@@ -332,19 +336,19 @@ syncing, but that don't seem appropriate for Org backport.
Eli Zaretskii
Mon Jul 31 11:11:23 2023 -0400
-- [ ] 4c01b0deee13808605b05a89e927e67eaf67edbd
+- [X] 4c01b0deee13808605b05a89e927e67eaf67edbd
Fix orgtbl-to-table.el function to include last cell border
Jakub Ječmínek
Thu Jun 22 17:38:56 2023 +0200
-- [ ] ace9f6775580459c35254607d866f3bb22a8c45b
+- [X] ace9f6775580459c35254607d866f3bb22a8c45b
Avoid using rx `any` for `not-newline`
Mattias Engdegård
Tue May 30 17:44:53 2023 +0200
-- [ ] af4791b5706f494d73fd00c391ff867fb2c5a06d
+- [X] af4791b5706f494d73fd00c391ff867fb2c5a06d
Fix apparently wrong `delete` and `delq` value discards (bug#61730)
Mattias Engdegård
@@ -392,7 +396,7 @@ syncing, but that don't seem appropriate for Org backport.
Eli Zaretskii
Fri Apr 21 07:29:14 2023 -0400
-- [ ] 54d40577c4bb64d25db030b7d11ab553364e375d
+- [X] 54d40577c4bb64d25db030b7d11ab553364e375d
(org-table-make-reference): Fix compiler warning
Stefan Monnier