orgmode-backports.org: Update

1 files changed, 62 insertions, 5 deletions

diff --git a/orgmode-backports.org b/orgmode-backports.org
index 3f728ee..93a9e8e 100644
--- a/orgmode-backports.org
+++ b/orgmode-backports.org
@@ -54,11 +54,47 @@ 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 [77/94]
+** master branch [84/101]
 :PROPERTIES:
 :ref:      origin/master
 :END:
 
+- [ ] 563bf2fae5ec238172f1f16c81e51b9aadd77017
+
+  ; * lisp/org/ol.el (org-link--decode-compound): `lsh` -> `ash`
+  Mattias Engdegård
+  Wed Jul 20 13:51:55 2022 +0200
+
+- [X] dbed53839136ef0e3f283599f51a5cef00343e28
+
+  Merge from origin/emacs-28
+  Stefan Kangas
+  Sun Jul 17 06:30:41 2022 +0200
+
+- [X] 10b69198708105655c49b62ac7d6185abb7e02a7
+
+  ; Fix typos
+  Stefan Kangas
+  Sat Jul 16 10:07:38 2022 +0200
+
+- [ ] 2a05479c221d4a13b15ed731e4eb1c0de99e97ed
+
+  ; Fix typos: prefer American spelling
+  Stefan Kangas
+  Thu Jul 14 12:13:31 2022 +0200
+
+- [X] 4e79f77635a80e0c25841ba15feb0e70c8824516
+
+  Merge from origin/emacs-28
+  Stefan Kangas
+  Thu Jul 14 11:37:42 2022 +0200
+
+- [X] ba0871bef1e7d321f1124a6ad20e9be158a976dd
+
+  ; Fix typos: prefer American spelling
+  Stefan Kangas
+  Wed Jul 13 13:04:22 2022 +0200
+
 - [ ] 2a8d083607e7e0fe9358f1f6526dbd8aa928af61
 
   Drop support for the dead third-party w3 package
@@ -196,12 +232,15 @@ syncing, but that don't seem appropriate for Org backport.
   Kyle Meyer
   Sat Jun 4 16:21:06 2022 -0400
 
-- [ ] b2bce107b15d6e0c2b773704179c6bf463525459
+- [X] b2bce107b15d6e0c2b773704179c6bf463525459
 
   Further audits of single quotes in Lisp doc strings
   Lars Ingebrigtsen
   Tue May 24 13:17:53 2022 +0200
 
+  Ported early due to conflicts with 01b0fb14b (Backport from main:
+  Escape single left quotes in docstrings, 2022-07-24).
+
 - [X] 1fc1d8b88994303ac7c1aac673cb3fead5ff4d9e
 
   Merge from origin/emacs-28
@@ -256,18 +295,24 @@ syncing, but that don't seem appropriate for Org backport.
   Kyle Meyer
   Sun Apr 24 21:07:40 2022 -0400
 
-- [ ] 2d71fd3b041506c68b5f1cd1e409e09e25778c34
+- [X] 2d71fd3b041506c68b5f1cd1e409e09e25778c34
 
   Further doc string quoting fixes
   Lars Ingebrigtsen
   Fri Apr 22 17:16:42 2022 +0200
 
-- [ ] bbf389ea6deab229ba18dc519fe712ec982609d1
+  Ported early due to conflicts with 01b0fb14b (Backport from main:
+  Escape single left quotes in docstrings, 2022-07-24).
+
+- [X] bbf389ea6deab229ba18dc519fe712ec982609d1
 
   Audit quoting the quote character in doc strings
   Lars Ingebrigtsen
   Fri Apr 22 16:17:22 2022 +0200
 
+  Ported early due to conflicts with 01b0fb14b (Backport from main:
+  Escape single left quotes in docstrings, 2022-07-24).
+
 - [X] 6cd43d62055c9ec27cacdcaff13d4a52b7efdff2
 
   Merge from origin/emacs-28
@@ -668,11 +713,23 @@ syncing, but that don't seem appropriate for Org backport.
 
   dummy marker for emacs-28 split
 
-** emacs-28 [132/132]
+** emacs-28 [134/134]
 :PROPERTIES:
 :ref:      origin/emacs-28
 :END:
 
+- [X] 10b69198708105655c49b62ac7d6185abb7e02a7
+
+  ; Fix typos
+  Stefan Kangas
+  Sat Jul 16 10:07:38 2022 +0200
+
+- [X] ba0871bef1e7d321f1124a6ad20e9be158a976dd
+
+  ; Fix typos: prefer American spelling
+  Stefan Kangas
+  Wed Jul 13 13:04:22 2022 +0200
+
 - [X] 48bda83d3591d33c5bb8292d9edb06ef3c3f93bd
 
   Update to Org 9.5.4-3-g6dc785