diff options
| -rw-r--r-- | orgmode-backports.org | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org index 43676bf..6f18d15 100644 --- a/orgmode-backports.org +++ b/orgmode-backports.org @@ -54,11 +54,23 @@ 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 [73/89] +** master branch [75/91] :PROPERTIES: :ref: origin/master :END: +- [X] fc46552dc8273e41e40b395b554eb0e3cfa386b9 + + Merge from origin/emacs-28 + Stefan Kangas + Sat Jun 25 06:30:26 2022 +0200 + +- [X] 1f6750b53a872a5747dff92b8f61cfede0c5a6a6 + + Avoid treating number as an enum in the org manual + Stefan Kangas + Fri Jun 24 19:18:50 2022 +0200 + - [X] f94e93a6eec92d834a6b545d8d4b68280b0993b0 org-cite-list-citations: Cache footnote-definition searches @@ -632,11 +644,17 @@ syncing, but that don't seem appropriate for Org backport. dummy marker for emacs-28 split -** emacs-28 [130/130] +** emacs-28 [131/131] :PROPERTIES: :ref: origin/emacs-28 :END: +- [X] 1f6750b53a872a5747dff92b8f61cfede0c5a6a6 + + Avoid treating number as an enum in the org manual + Stefan Kangas + Fri Jun 24 19:18:50 2022 +0200 + - [X] 9a4862a9738c2abab8fb4fb2e4e57b69dea679d7 * doc/misc/org.org: Remove spurious markup. |