* Commit message guidelines

If the commit has ChangLog entries, include the parts relevant for Org
files, tweaking the paths to match the Org repo (e.g.,
"lisp/org/org.el" to "lisp/org.el").

"Backport commit NNNNNN from Emacs master branch" as the subject and
then include any ChangeLog entries and then a summary block in the
format

    subject
    full hash
    author
    author date

The ~org-maint-insert-emacs-commit-info~ command in org-maint.el can
be used to insert the original commit message plus the above block of
information.

Note that, as [[https://orgmode.org/list/87d19h8sr5.fsf@kyleam.com][discussed on the list]], "backport" isn't really the best
term for this, but it probably makes sense to continue using it in the
commit messages at this point.

* Commands

org-maint.el defines the following commands

- ~org-maint-check-for-new~

  Check for new commits from Emacs to port to the Org repo.

  This should be called with point at the top of a subheading of
  "Backport list" (e.g., the  [[*master branch][master branch]] heading).

- ~org-maint-apply-emacs-commit~

  Apply an Emacs commit to the Org repo.

- ~org-maint-insert-emacs-commit-info~

** Applying failed patch

When ~git am~ fails, the patch can be partially applied with

: git apply --directory=lisp/ --reject -p3 .git/rebase-apply/0001

After resolving the conflict, run

: git am --continue

* Backport list

NOTE: Look for "ONSYNC" for changes that should be considered when
syncing, but that don't seem appropriate for Org backport.

** master branch [36/57]
:PROPERTIES:
:ref:              origin/master
:exclude-ref:      origin/emacs-29
:END:

- [ ] 486094126ba77e45c50acb87f5ad3e4147608446

  Merge from origin/emacs-29
  Eli Zaretskii
  Sat Dec 9 07:25:21 2023 -0500

- [X] c9d7740574758d47c8864cbada5fd2a2b2ee8911

  Merge from origin/emacs-29
  Eli Zaretskii
  Sat Nov 11 05:31:52 2023 -0500

- [ ] 67977ae5974e54d34034aa7990cf22dd162c179b

  Eliminate some nested repetitions in regexps
  Mattias Engdegård
  Sun Oct 29 17:40:36 2023 +0100

- [ ] 2e19e11638339d0ae97958547bd87b4b15c2ee52

  Don't use obsolete `sleep-for` argument
  Stefan Kangas
  Sat Oct 21 12:26:36 2023 +0200

- [X] bbccef3ceb63bc17ab9d2aee5326df5d70ce4ab3

  Merge from origin/emacs-29
  Michael Albinus
  Fri Oct 13 16:18:06 2023 +0200

- [ ] 6b2219cd2744c711580cc7226554e69c8cec8247

  ; Add several "duplicate value in `cond`" FIXMEs
  Stefan Kangas
  Sun Oct 1 19:00:26 2023 +0200

- [X] cc8726d2c8bc0e3b67cb8b97e388f9339bea0f96

  Merge from origin/emacs-29
  Eli Zaretskii
  Sat Sep 23 09:32:57 2023 -0400

- [ ] e0070fc574a8621b2fbb1aaca678b974a3dc5fd5

  Improve org-babel-execute:eshell docstring
  Stefan Kangas
  Sun Sep 17 16:57:25 2023 +0200

- [ ] 1e270e580d3bb9ca1b3766a296611f76ec13f6f1

  ; Grammar fixes ("allow to" et al)
  Stefan Kangas
  Sun Sep 17 16:49:21 2023 +0200

- [ ] ff87aecf8554042b043467a7aaff1a758df0bbae

  Address "Useless clause following default cond clause" warnings
  Stefan Monnier
  Tue Sep 12 12:59:03 2023 -0400

- [ ] c0400151f8880862d460f0e47be287237a6182ad

  Correct many instances of ``allows to''
  Po Lu
  Sun Sep 10 09:33:50 2023 +0800

- [X] 0273914921833d2e2b6548cf69297c24a50cff74

  Merge from origin/emacs-29
  Eli Zaretskii
  Sat Sep 9 04:32:45 2023 -0400

- [X] ec3ea8c036a4dd4d7b331081320502c6c8ff1961

  Merge from origin/emacs-29
  Eli Zaretskii
  Sat Sep 2 04:28:17 2023 -0400

- [ ] 64269125156836060eb95b28b01b877c74e800d8

  ; Delete redundant defvars; font-lock is preloaded
  Stefan Kangas
  Fri Aug 25 23:54:51 2023 +0200

- [ ] 2b311a47dd0cde82fb9d32c303f13700cae4f0b3

  Assume that font-lock is preloaded
  Stefan Kangas
  Fri Aug 25 20:35:38 2023 +0200

- [ ] 73b24a41412eb97a9451a8310da0ebab379f7534

  Make org-mouse compatible with touch screen event emulation
  Po Lu
  Wed Aug 23 09:56:35 2023 +0800

- [ ] 4f714dc08137d36d0d1e886814008f2abe5712c0

  Support desktop notifications on Android
  Po Lu
  Sun Aug 20 20:25:53 2023 +0800

- [ ] 5856ea5e4e897f4cb5cd1c3c28d14b335fe5cf54

  Introduce support for Desktop Notifications on Haiku
  Po Lu
  Thu Aug 17 08:34:32 2023 +0000

- [ ] 1ad318cf2ae22d945f8bfcd61981d619467a36da

  ob-tangle.el: fix unintended range in regexp
  Mattias Engdegård
  Wed Aug 16 16:55:38 2023 +0200

- [X] b9b4d8689fa78a5696a5e2d96a08a761fbf3cc82

  Merge from origin/emacs-29
  Michael Albinus
  Mon Aug 14 09:45:07 2023 +0200

- [X] a5bbc51f474568ad2e4511a08614ac8ec4ca2481

  This is a stand-in for merges from master into feature/android,
  starting with fd074f3133a3 and ending with the commit above.

  Based on diff of c75c79971975 (merge of feature/android to master)
  and a5bbc51f4745, only 9082b4e6ee27 (below) touched Org files.

- [ ] 9082b4e6ee27b995cbb61668cb437d7b91c7f5f8

  Make binaries distributed with Emacs work on Android
  Po Lu
  Tue Jan 24 21:37:22 2023 +0800

- [ ] c75c7997197502189023c9f47140474fa7fd719e

  ; Fix http/https thinko in org manual
  Stefan Kangas
  Fri Aug 4 09:57:27 2023 +0200

- [ ] 0910230be6ee858d8d8849a1fc9559bfd163dc38

  ; Prefer HTTPS to HTTP in more links
  Stefan Kangas
  Wed Aug 2 23:32:28 2023 +0200

  Related emacs-devel discussion:
  https://yhetil.org/emacs-devel/838rarw94m.fsf@gnu.org

- [X] 30bcd71476127fa20da37372501637b07cd53d6c

  Merge from origin/emacs-29
  Eli Zaretskii
  Mon Jul 31 11:11:23 2023 -0400

- [ ] 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

  Avoid using rx `any` for `not-newline`
  Mattias Engdegård
  Tue May 30 17:44:53 2023 +0200

- [ ] af4791b5706f494d73fd00c391ff867fb2c5a06d

  Fix apparently wrong `delete` and `delq` value discards (bug#61730)
  Mattias Engdegård
  Wed May 24 23:01:10 2023 +0200

- [X] f518543aa4ed00f91842dc5a58cc90a320e3e2e5

  Merge from origin/emacs-29
  Eli Zaretskii
  Thu May 18 07:49:49 2023 -0400

- [X] 670174a6d5f7856df523505f8fb8fc90388de47f

  Eliminate some mutation of program constants
  Mattias Engdegård
  Wed May 17 11:00:25 2023 +0200

  Ihor ported to bugfix with da1bc002f (Backport Emacs commit
  670174a6d5f, 2023-07-30).

- [X] daf602a5c8ec9e5d94f5e1e412182760a02c2505

  Merge from origin/emacs-29
  Eli Zaretskii
  Tue May 2 08:50:09 2023 -0400

- [X] 095ec506d03b76155b399fd7b23554279b2cfee0

  Merge from origin/emacs-29
  Eli Zaretskii
  Tue Apr 25 09:57:23 2023 -0400

- [X] 62e4eb8fcf71a852117b372809bd4a7953f9b679

  Fix build when Org's version changes
  Eli Zaretskii
  Mon Apr 24 14:16:05 2023 +0300

  Ihor ported to bugfix with 8eb209984 (Backport commit 62e4eb8fcf7
  from Emacs, 2023-04-24).

- [X] f1ce49d148b334a8fb5302c4dd596aceffbb6b57

  Merge from origin/emacs-29
  Eli Zaretskii
  Fri Apr 21 07:29:14 2023 -0400

- [ ] 54d40577c4bb64d25db030b7d11ab553364e375d

  (org-table-make-reference): Fix compiler warning
  Stefan Monnier
  Mon Apr 10 21:33:56 2023 -0400

- [X] 4f0849a9e6d29e25d23e061bd81bacce9468856d

  Remove unused values in effect context
  Mattias Engdegård
  Sun Apr 9 16:45:40 2023 +0200

  This was independently fixed by bugfix's 52dc48050 (Handle compiler
  warnings from Emacs master, 2023-04-27), but in slightly different
  way.  Ported and merged to bugfix to avoid 'emacs-29 -> master'
  conflict in the emacs.git: 2ab083dd1 (Merge branch
  'km/from-emacs-master' into bugfix, 2023-04-30)

- [X] 2d1a96e878ef8dd9a27fb360aa6c85b1dc9b856e

  Merge from origin/emacs-29
  Eli Zaretskii
  Thu Apr 6 14:38:20 2023 -0400

- [X] 42fba8f36b19536964d6deb6a34f3fd1c02b43dd

  Merge from origin/emacs-29
  Stefan Kangas
  Mon Mar 20 06:30:40 2023 +0100

- [X] aad617870b45aa2e68159150c2354db6f7a8cf09

  Merge from origin/emacs-29
  Stefan Kangas
  Mon Mar 6 06:30:13 2023 +0100

- [X] 839a86b02ba0043f5c8d0ac1f33c9c7b55314d00

  Merge from origin/emacs-29
  Stefan Kangas
  Tue Feb 21 10:58:00 2023 +0100

- [X] 609319da870eac75cf4715de8abfaac9233d98f9

  Merge from origin/emacs-29
  Stefan Kangas
  Mon Feb 13 06:30:12 2023 +0100

- [X] 207a0d9408cb97b9ae78469e2487e3075ade03f8

  Merge from origin/emacs-29
  Stefan Kangas
  Mon Jan 30 07:19:43 2023 +0100

- [X] cd42244fca8785fb57c25c731afcf3227c2ad14b

  Merge from origin/emacs-29
  Stefan Kangas
  Sat Jan 28 06:30:25 2023 +0100

- [X] 114912254262ce412f30e43e3798c750a752b741

  Merge from origin/emacs-29
  Stefan Kangas
  Mon Jan 23 06:30:18 2023 +0100

- [X] 60240f54e5fed16a0522fb766ffef073db596f1f

  Merge from origin/emacs-29
  Stefan Kangas
  Tue Jan 10 09:51:57 2023 +0100

- [X] c209802f7b3721a1b95113290934a23fee88f678

  Merge from origin/emacs-29
  Stefan Kangas
  Mon Jan 2 12:06:37 2023 +0100

- [X] 3c55fbd4adfcf5d0d0ee8fdbbd6f012fa951f0b2

  Merge from origin/emacs-29
  Eli Zaretskii
  Sun Jan 1 05:47:47 2023 -0500

- [X] 419ca81809c2eda9c9f102b7da820a6eb9685cc8

  Merge from origin/emacs-29
  Stefan Kangas
  Mon Dec 26 06:30:21 2022 +0100

- [X] a5d39e11443fa30c8e8bc58254a1a59550dcd99e

  ; Fix typos
  Stefan Kangas
  Fri Dec 23 18:21:10 2022 +0100

  Covered by cherry pick to emacs-29 (2608e5edcca).

- [X] 6c540e38f4d9528f8e6dfdc44d1b95840efab456

  Merge from origin/emacs-29
  Stefan Kangas
  Mon Dec 19 04:42:19 2022 +0100

- [X] 03892d4f7c1253bc1affeedd227eb0a1520de90e

  Merge from origin/emacs-29
  Stefan Kangas
  Fri Dec 16 08:45:06 2022 +0100

- [X] 2f0bd8167c015bab729b998daa1e77d24d54ced4

  Merge from origin/emacs-29
  Po Lu
  Fri Dec 9 09:31:37 2022 +0800

- [X] 6c06379c030908a8106bc0f0290d472f67aa503c

  Merge from origin/emacs-29
  Eli Zaretskii
  Thu Dec 8 12:52:37 2022 -0500

- [X] 7d6f9753ade57821f5c409bcdeea700be8e53a74

  Merge from origin/emacs-29
  Stefan Kangas
  Thu Dec 1 16:54:53 2022 +0100

- [X] f7c3abb8d2d3a3d26a1198fed8157111bed41d6c

  Merge from origin/emacs-29
  Stefan Kangas
  Thu Dec 1 14:38:29 2022 +0100

- [X] 65468109a53c605df991f72521de5ed3b63ba6b8

  Merge from origin/emacs-29
  Po Lu
  Thu Dec 1 14:24:43 2022 +0800

- [X] f3ef75107ba91f1bc5e6f1e11bee5fabab2458e1

  Merge from origin/emacs-29
  Stefan Kangas
  Wed Nov 30 16:10:39 2022 +0100

** emacs-29 [135/135]
:PROPERTIES:
:ref:      origin/emacs-29
:END:

- [X] 5f923ff1a6a8a9ff6f06dc49c8e0e2ceee111567

  ; Fix typos
  Stefan Kangas
  Sun Dec 3 23:31:30 2023 +0100

- [X] 5bdc61bc0efc704c85b78f36f5f7e5f6c42bb877

  Update to Org 9.6.11
  Kyle Meyer
  Sun Nov 5 21:46:42 2023 -0500

- [X] eedd9db6190a7f69403aefe8098a554ef2b51371

  Update to Org 9.6.10
  Kyle Meyer
  Mon Oct 9 23:47:52 2023 -0400

- [X] 85f49a9bc8b9bf699a692787820efc0f8aa67545

  Update to Org 9.6.9
  Kyle Meyer
  Sun Sep 17 22:11:36 2023 -0400

- [X] 3550f44c17c31f829d7d51b2928a83ae381a8558

  ; Fix typos
  Stefan Kangas
  Sat Sep 2 18:57:11 2023 +0200

  changelog-only

- [X] 648a5e33e80417855b908693e36cba56cd2c796c

  Update to Org 9.6.8-3-g21171d
  Kyle Meyer
  Sun Aug 27 22:38:34 2023 -0400

- [X] 3eff53b4564ba7633807d67708dc9337765db259

  Update to Org 9.6.7-13-g99cc96
  Kyle Meyer
  Sun Aug 13 22:11:45 2023 -0400

- [X] 80c9f491fc8dc068421f32cd15e0b387a6d1ee11

  Update to Org 9.6.7-5-gd1d0c3
  Kyle Meyer
  Sun Jul 30 16:52:11 2023 -0400

- [X] 95a724abaaca40e3fbad69593cb9fab39a249742

  Update to Org 9.6.6
  Kyle Meyer
  Sun May 14 21:04:37 2023 -0400

- [X] 0e52beeacead956cdaa7921e911afc2fd29aea61

  Update to Org 9.6.5-3-g2993f4
  Kyle Meyer
  Sun Apr 30 19:36:21 2023 -0400

- [X] 2bcf11d0efecd18a1be8bcf0ac1a1dadb14d971a

  * lisp/org/org-macs.el (org--inhibit-version-check): Fix docstring
  Stefan Monnier
  Sun Apr 30 09:41:13 2023 -0400

- [X] d80f959beded280ed61623ec36ea2a9ac07cc747

  Update to Org 9.6.4-9-g8eb209
  Kyle Meyer
  Mon Apr 24 19:47:12 2023 -0400

- [X] 596b780ab71d6495f866de35c234fe65a8a7914a

  Update to Org 9.6.4-2-g0f6ae7
  Kyle Meyer
  Sun Apr 16 21:13:08 2023 -0400

- [X] 479626dbac97d4415ae861c3f66fc33c5fd6fa14

  Update to Org 9.6.3-2-gf2949d
  Kyle Meyer
  Sun Apr 2 23:03:32 2023 -0400

- [X] a8c23677d3939b8af1bcddb63244fe7b5bb384a4

  Update to Org 9.6.2
  Kyle Meyer
  Sun Mar 26 17:01:30 2023 -0400

- [X] 829e5dfabea9fd22b1bb04f5f388c0c52b984606

  Update to Org 9.6.1-48-g92471e
  Kyle Meyer
  Sat Mar 18 21:41:22 2023 -0400

- [X] b1b3af5b90ba6f5416dfaf60e33729b32ca2f195

  Update to Org 9.6.1-40-g3d817c
  Kyle Meyer
  Sun Mar 5 17:34:13 2023 -0500

- [X] fc4bfa76db958f48daed7c5812921b1653c31175

  Update to Org 9.6.1-34-geea8da
  Kyle Meyer
  Mon Feb 20 00:41:31 2023 -0500

- [X] fe2ea5ddd8da91c8a0f3064f1447fc4fbbda68ab

  Update to Org 9.6.1-31-gaf1bb1
  Kyle Meyer
  Sun Feb 12 15:43:07 2023 -0500

- [X] 8360e12f0ea3a3ccf0305adab3c7ea7e38af36c1

  Update to Org 9.6.1-23-gc45a05
  Kyle Meyer
  Sun Jan 29 21:42:17 2023 -0500

- [X] 752c526585fe3f10e064b9ddaca6ae6cdeaa0004

  ; Fix typos
  Stefan Kangas
  Fri Jan 27 11:33:35 2023 +0100

  changelog-only

- [X] 647cc9c65e7c2b691267bde7333eff6cc8d9132a

  Update to Org 9.6.1-16-ge37e9b
  Kyle Meyer
  Sun Jan 22 21:53:39 2023 -0500

- [X] 34793337783489297313c67d4a56682514877597

  * lisp/org/ob-ruby.el: Fix outdated comments.
  Dmitry Gutov
  Fri Jan 20 23:32:21 2023 +0200

- [X] 920a7d38e96134289393b7bfcc3a7b88be73925b

  ; Fix typos
  Stefan Kangas
  Sun Jan 15 02:14:19 2023 +0100

  Related emacs-devel discussion:
  https://yhetil.org/emacs-devel/83a62k72lx.fsf@gnu.org/

- [X] f4f30ff4c44dcfdf780f1981aa541af713f2805f

  Update to Org 9.6.1
  Kyle Meyer
  Wed Jan 11 21:15:37 2023 -0500

- [X] e04b3d41bb41ccca3d403345b12b9a614213d488

  Update to Org 9.6-90-ga6523f
  Kyle Meyer
  Sat Jan 7 23:50:54 2023 -0500

- [X] 2569ede9c496bb060e0b88428cb541088aaba1f9

  Update to Org 9.6-81-g563a43
  Kyle Meyer
  Sun Jan 1 22:24:28 2023 -0500

- [X] cae528457cb862dc886a34240c9d4c73035b6659

  ; Add 2023 to copyright years.
  Eli Zaretskii
  Sun Jan 1 05:31:12 2023 -0500

- [X] 9292f595a71870eec1ffdfd187b859cc990c2f0b

  ; Fix typos
  Stefan Kangas
  Sat Dec 31 12:43:32 2022 +0100

- [X] 2608e5edcca5094b61b4ccebcef160cc2bfd7f83

  ; Fix typos
  Stefan Kangas
  Mon Dec 26 10:42:02 2022 +0100

- [X] b1e68a33d89de34b432d6f39464f31a565604f3f

  Update to Org 9.6-61-g63e073f
  Kyle Meyer
  Sun Dec 25 11:36:36 2022 -0500

- [X] 3e02029642c2c4c329c95d1a1381ab4a83a606b5

  Update to Org 9.6-49-g47d129
  Kyle Meyer
  Sat Dec 17 17:28:27 2022 -0500

- [X] 033071692c7cd1cd550d25170d4b3168668567ac

  ; Fix typos
  Stefan Kangas
  Fri Dec 16 08:29:28 2022 +0100

  changelog-only

- [X] a15cd55044c6bb4d4e9f9aec23b8b5b9cbcb38ac

  ; Don't quote nil in comments
  Stefan Kangas
  Thu Dec 15 02:35:00 2022 +0100

- [X] 01154166057e7cf289318a8cfa4d43716f26ca20

  Update to Org 9.6-31-g954a95
  Kyle Meyer
  Sat Dec 10 16:59:46 2022 -0500

- [X] 26267040549da6e7f8223bea3b5344d0d5bef527

  ; Normalize GPLv3 license statements in new files
  Stefan Kangas
  Fri Dec 9 00:13:00 2022 +0100

- [X] 8fb2afe051168b2eac2bba0ee102039d0af90a05

  ; Fix typos
  Stefan Kangas
  Thu Dec 8 07:17:47 2022 +0100

- [X] 70ecdebc92c879af90f2d25a2b751d1cc4f3f80d

  ; Fix typos (don't abbreviate "with" or "without")
  Stefan Kangas
  Thu Dec 1 16:36:09 2022 +0100

  changelog-only

- [X] 8b3baadf671b7b3d5058808c4655eca8bd46015e

  Fix compilation of Org 9.6 on MS-Windows
  Eli Zaretskii
  Thu Dec 1 14:40:47 2022 +0200

- [X] 4b2f5425d7af1a6f992ad8ce0a4452a2e778815a

  Fix types in various defcustom declarations
  Mattias Engdegård
  Thu Dec 1 13:03:19 2022 +0100

- [X] 8617edfffd07eb80561b4de6a37c5b0b5f442e07

  ; Fix typos
  Stefan Kangas
  Wed Nov 30 16:59:41 2022 +0100

- [X] c3466099c5f44c52ec73a1bbbb2b42de6f29ac7f

  Org regexp style fixes
  Mattias Engdegård
  Wed Nov 30 13:23:38 2022 +0100

- [X] 0625651e8a61c9effc31ff771f15885a3a37c6e6

  Update to Org 9.6-3-ga4d38e
  Kyle Meyer
  Tue Nov 29 23:05:53 2022 -0500

- [X] beaa2e49530b8149d2c22cb5fa15b8d48f7937b6

  ; Fix typos (misspelled symbols)
  Stefan Kangas
  Mon Nov 21 15:20:11 2022 +0100

- [X] 16318bfb518aa7bc06e502e6fad7e53ec91067f9

  ; Fix typos
  Stefan Kangas
  Sun Nov 20 12:59:39 2022 +0100

- [X] ba485eb949ddec53b1d7b5d78f3fcfbe2be60d7d

  ; Fix typos
  Stefan Kangas
  Fri Nov 18 16:02:19 2022 +0100

- [X] 93036209fae87dc620b27b2ce2e0146e6252113c

  ; Fix typos (duplicate words)
  Stefan Kangas
  Thu Nov 17 09:34:24 2022 +0100

- [X] 623db40dd1cd21623c5cecdc0abbf3ce885f92b1

  ; * lisp/*.el: Fix typos in docstrings
  Juanma Barranquero
  Thu Nov 17 08:48:02 2022 +0100

- [X] 6f48b46b03cd58a541684c57e42eb4679794f0fd

  ; Fix typos
  Stefan Kangas
  Fri Nov 11 15:52:37 2022 +0100

  changelog only

- [X] 0f5352377539bc2587b9bfd068de0f4b3bf8b248

  Remove redundant library installation instructions
  Stefan Kangas
  Fri Nov 11 04:29:29 2022 +0100

- [X] db2ed9f333879e5ac283fb48c8b06ed4022f0af9

  ; Fix several symbol name typos
  Stefan Kangas
  Wed Oct 26 23:04:23 2022 +0200

- [X] 3187225416c66061b67e89092addc15cad2202b9

  ; Prefer HTTPS to HTTP in many URLs
  Stefan Kangas
  Sat Oct 15 13:06:45 2022 +0200

- [X] a95062e036d9d5fc45d9a3ba1c10b0bd9b587399

  Delete broken link to Network Theory Ltd.
  Stefan Kangas
  Sat Oct 15 13:06:45 2022 +0200

- [X] f3769bc32a3d32377a83b33d416205f80814e422

  org.el: Improve bindings of `inhibit-*` vars
  Stefan Monnier
  Fri Oct 7 12:29:56 2022 -0400

- [X] fee9deff5309cfc5f952181cb2cae1a344b4cc45

  Revert "Decrease use of the word "Emacsen" in docs"
  Stefan Kangas
  Sat Oct 1 22:34:47 2022 +0200

- [X] 55f46cc77cb9d72fbabadb63d8aeab45c5e005e2

  Decrease use of the word "Emacsen" in docs
  Stefan Kangas
  Sat Oct 1 17:16:03 2022 +0200

  Not applied.  Reverted in next commit.

- [X] 8dacd8cd914fdbe0f6f17ca57915611d48e9124d

  Add a new command vc-pull-and-push
  Lars Ingebrigtsen
  Sat Sep 24 15:19:03 2022 +0200

- [X] 9b14e312f409216dab647f839724d5df029e8195

  Merge from origin/emacs-28
  Stefan Kangas
  Wed Sep 21 10:25:06 2022 +0200

- [X] 6e4f6e97bf13f096f6e1a300c67b3489e8000a0f

  Merge from origin/emacs-28
  Stefan Kangas
  Fri Sep 16 16:27:37 2022 +0200

- [X] 5c8b76fc873676457810817958c119542ffe16f6

  Merge from origin/emacs-28
  Stefan Kangas
  Mon Sep 5 06:30:32 2022 +0200

- [X] b7e867b841f47dcff3aeaef9b5608a237386ce70

  Make point-at-eol and point-at-bol obsolete
  Stefan Kangas
  Tue Aug 23 04:54:57 2022 +0200

- [X] 06d7161476255c77defa119fffa842b7abaa0dcb

  Fix some no-X build warnings
  Lars Ingebrigtsen
  Mon Aug 22 19:22:33 2022 +0200

- [X] 0c410206aa91b9bc9a0922d63ec34de765eb86a6

  Merge from origin/emacs-28
  Stefan Kangas
  Mon Aug 22 06:30:29 2022 +0200

- [X] 48aacbf292fbe8d4be7761f83bf87de93497df27

  Make many seldom-used generalized variables obsolete
  Lars Ingebrigtsen
  Sun Aug 21 22:12:43 2022 +0200

- [X] 57259773b4f0b992e38843859a8b93d82317ded3

  ; * lisp/org/org.el: Delete unnecessary declarations.
  Stefan Kangas
  Sun Aug 14 23:46:33 2022 +0200

- [X] 1137219c97dda512a309ce4bfad5abde0d2be206

  Make compat alias image-refresh obsolete
  Stefan Kangas
  Tue Aug 9 14:04:39 2022 +0200

- [X] b335e1a0469105bb55b9741ae3106dc0a6023ce2

  * lisp/org/org.el: Fix load of compiled or compressed org-loaddefs
  Peder O. Klingenberg
  Thu Aug 4 20:27:56 2022 +0200

- [X] 4d64c39fad481f2dc125aa4d207ab191bf697529

  ; * lisp/org/ob-lilypond.el: Add FIXME.
  Stefan Kangas
  Thu Aug 4 14:48:44 2022 +0200

- [X] 4c1bc8315d8e677e4eeb2760d7a5ab7b7553359b

  Fix up some prefix registration problems in doc strings
  Lars Ingebrigtsen
  Thu Aug 4 11:03:10 2022 +0200

- [X] 0a6e2b3bfce8b5ae9e713e0668cb3cf5609073e2

  Fix quoting of #' in some doc strings
  Lars Ingebrigtsen
  Wed Aug 3 13:14:32 2022 +0200

- [X] 2682ea1b3a9524eb54efac41b3221b514374c232

  Fix org.el byte-compile warning in org-loaddefs.el
  Lars Ingebrigtsen
  Sun Jul 31 11:43:48 2022 +0200

- [X] 22a5f022344af8c0c0a9eddc2ac5ad36392d0cef

  Doc fixes: don't mention EFS
  Stefan Kangas
  Thu Jul 28 10:48:38 2022 +0200

- [X] 70341cab3eb26e2f49bbc13d6bca247ab9403abc

  string-equal-ignore-case: new function
  Sam Steingold
  Tue Jul 26 13:49:28 2022 -0400

- [X] 14d8c6f7b13f3237aa5e54f5c16ef0a9189c0459

  Merge from origin/emacs-28
  Stefan Kangas
  Mon Jul 25 06:30:18 2022 +0200

- [X] 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] 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] 2a8d083607e7e0fe9358f1f6526dbd8aa928af61

  Drop support for the dead third-party w3 package
  Stefan Kangas
  Sat Jul 9 17:27:49 2022 +0200

- [X] 9230953f23c432699347bb3eeadebd82e4cbbfaa

  ; Fix typos.
  Stefan Kangas
  Sat Jul 2 10:20:23 2022 +0200

- [X] 087476bce183a404b2a7e62b15b5033504cb4819

  Merge from origin/emacs-28
  Stefan Kangas
  Mon Jun 27 06:30:25 2022 +0200

- [X] fc46552dc8273e41e40b395b554eb0e3cfa386b9

  Merge from origin/emacs-28
  Stefan Kangas
  Sat Jun 25 06:30:26 2022 +0200

- [X] f94e93a6eec92d834a6b545d8d4b68280b0993b0

  org-cite-list-citations: Cache footnote-definition searches
  Ihor Radchenko
  Thu Jun 16 10:55:05 2022 +0300

  From Org's main: b061e7b61 (org-cite-list-citations: Cache
  footnote-definition searches, 2022-06-16)

  https://yhetil.org/emacs-devel/87h74l9jk8.fsf@localhost

- [X] 4f37a3b299bcec71a0e9bdd84b7b226494006fe4

  org-element-map: Avoid repetitive `plist-get' call
  Ihor Radchenko
  Thu Jun 16 10:54:14 2022 +0300

  From Org's main: 37a447ae0 (org-element-map: Avoid repetitive
  `plist-get' call, 2022-06-16)

  https://yhetil.org/emacs-devel/87h74l9jk8.fsf@localhost

- [X] 979308b4cad2b573606ed71a1689a47a9e7a9e98

  org-export-data: Concatenate strings in temporary buffer for performance
  Ihor Radchenko
  Thu Jun 16 10:53:51 2022 +0300

  From Org's main: a158b263a (org-export-data: Concatenate strings in
  temporary buffer for performance, 2022-06-16)

  https://yhetil.org/emacs-devel/87h74l9jk8.fsf@localhost

  This was reverted in 811deae32 (Revert "org-export-data: Concatenate
  strings in temporary buffer for performance", 2022-06-17)

- [X] 0f7ceb4803cabcb3c406fa7c27ccb7625096058e

  org-export-as: Do not update buffer settings when not modified
  Ihor Radchenko
  Thu Jun 16 10:53:16 2022 +0300

  Frm Org's main: 076dd92ac (org-export-as: Do not update buffer
  settings when not modified, 2022-06-16)

  https://yhetil.org/emacs-devel/87h74l9jk8.fsf@localhost

- [X] d21412df06b99b551e67d39c097d95e8a284de73

  org-export-resolve-id-link: Pre-cache all the ids in the parse tree
  Ihor Radchenko
  Thu Jun 16 10:52:54 2022 +0300

  From Org's main: 84c89ea7c (org-export-resolve-id-link: Pre-cache
  all the ids in the parse tree, 2022-06-12)

  https://yhetil.org/emacs-devel/87h74l9jk8.fsf@localhost

- [X] 3236dedc2de5975afde877f7460bd012da89a98d

  org-export-resolve-fuzyy-link: Pre-cache all possible search cells
  Ihor Radchenko
  Thu Jun 16 10:52:36 2022 +0300

  From Org's main: 792cd4b0a (org-export-resolve-fuzyy-link: Pre-cache
  all possible search cells, 2022-06-12)

  https://yhetil.org/emacs-devel/87h74l9jk8.fsf@localhost

- [X] 5b3d4e7bf0b6a1eb576e1c6e6592028e3589f792

  org-export-get-footnote-definition: Pre-cache references in parse tree
  Ihor Radchenko
  Thu Jun 16 10:52:17 2022 +0300

  From Org's main: f51c28671 (org-export-get-footnote-definition:
  Pre-cache references in parse tree, 2022-06-12)

  https://yhetil.org/emacs-devel/87h74l9jk8.fsf@localhost

- [X] 17666093097d58466e9581b9ff1d07ec5e3eeebf

  Merge from origin/emacs-28
  Stefan Kangas
  Fri Jun 10 08:17:35 2022 +0200

- [X] d46e94f23fbbd522f2a017444b29f9f18203b4bc

  Merge from origin/emacs-28
  Stefan Kangas
  Sun Jun 5 06:30:25 2022 +0200

- [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
  Stefan Kangas
  Mon May 16 06:30:38 2022 +0200

- [X] 253374f81a13109b73afc8e319ca1fea72f68c72

  Remove some XEmacs compat code from org-mode
  Stefan Kangas
  Sat May 14 15:55:20 2022 +0200

- [X] cc8b6101f4479a80a6af7f9d80c6f9d774a85f40

  Remove some XEmacs compat code from org-mode
  Stefan Kangas
  Fri May 13 23:17:16 2022 +0200

- [X] 2fba71cf1fadc9d681e6be250d152cc156bf6a00

  Fix handling double-click-time nil or t
  Stefan Kangas
  Mon May 2 12:03:08 2022 +0200

- [X] fa1a7ac617619ef015e02e72950eef219ec62336

  Pacify byte compiler etc. on org-compat, org-macs
  Paul Eggert
  Thu Apr 28 13:41:35 2022 -0700

- [X] b3023de5431fc308e2a6db61ed4fdd18db785324

  Merge from origin/emacs-28
  Eli Zaretskii
  Thu Apr 28 18:37:34 2022 +0300

- [X] 3abb3681b57d7c8ca7fa808addb0a10b6b109cab

  Use org-time-convert-to-integer instead of by hand
  Paul Eggert
  Wed Apr 27 00:30:25 2022 -0700

- [X] 2d71fd3b041506c68b5f1cd1e409e09e25778c34

  Further doc string quoting fixes
  Lars Ingebrigtsen
  Fri Apr 22 17:16:42 2022 +0200

  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
  Paul Eggert
  Sun Apr 17 13:10:19 2022 -0700

- [X] 8ef37913d3be5ff518018acb6b0144d6e559b5ba

  Port Org encode-time usage back to Emacs 25
  Paul Eggert
  Tue Apr 5 17:52:34 2022 -0700

- [X] 7cee79655656f02c36fb2858eccce477b7d90b6b

  Merge from origin/emacs-28
  Stefan Kangas
  Mon Mar 21 06:30:40 2022 +0100

- [X] 8b66adfe065e0f21ec99c88e3cbb1cb16a94c6cd

  Merge from origin/emacs-28
  Stefan Kangas
  Mon Mar 7 06:33:56 2022 +0100

- [X] 1de7382b574ff9f40319d7a075d952cb944f96ca

  Merge from origin/emacs-28
  Stefan Kangas
  Mon Feb 28 06:33:06 2022 +0100

- [X] bee54495e92ddf5d75e3f68ac7e823b221306719

  Merge from origin/emacs-28
  Stefan Kangas
  Tue Feb 22 06:30:59 2022 +0100

- [X] 2ed240296c181cc677caeef1ec33befd8428aa98

  Merge from origin/emacs-28
  Eli Zaretskii
  Fri Feb 18 10:38:49 2022 +0200

- [X] d52c929e31f60ff0462371bfe27ebd479e3e82bd

  (with-demoted-errors): Warn on missing `format` arg
  Stefan Monnier
  Fri Feb 4 19:39:53 2022 -0500

  Applying to bugfix to avoid any fallout from bug#54225 (see
  <https://list.orgmode.org/YiAWerI35IoRNQyt@smoon.bkoty.ru/>).

- [X] 3652170d7dd3a0aa3cf59d7ccffbf13d6fa0118e

  Merge from origin/emacs-28
  Stefan Kangas
  Mon Jan 31 06:58:23 2022 +0100

- [X] 19d681d24bce0bcff1417c73035d1f9e34fbcc4a

  Merge from origin/emacs-28
  Stefan Kangas
  Sun Jan 16 06:51:09 2022 +0100

- [X] ad125a99273c7bd81d02d388af3c69125dfe27ee

  Merge from origin/emacs-28
  Stefan Kangas
  Sun Jan 2 06:31:44 2022 +0100

- [X] dcd76bd48df678d8234b904d7b13c997228519a3

  Merge from origin/emacs-28
  Eli Zaretskii
  Sat Jan 1 07:03:03 2022 -0500

- [X] 18b680cfd177e877991be2bd70ead628bbdc0aa0

  Fix bug#52467 by adding a new custom variable 'display-comint-buffer-action'
  Sam Steingold
  Tue Dec 28 17:28:49 2021 -0500

  Will likely need to be adjusted for backwards compatibility or
  rejected.

- [X] 4fedbfbfca87849db343c09c4006b52c845f95d2

  Merge from origin/emacs-28
  Stefan Kangas
  Mon Dec 27 06:32:28 2021 +0100

- [X] 5f57b41aa612e5f190f5a3c1ea013be114493a03

  ; Minor license statement fixes
  Stefan Kangas
  Mon Dec 20 22:31:31 2021 +0100

- [X] d745f4b6a0944778c495cd13e11fe096a9bd56f7

  Merge from origin/emacs-28
  Stefan Kangas
  Sun Dec 19 14:02:30 2021 +0100

- [X] e0ca8f791c2e4396f1e40d86c136ae547b40185d

  Prefer format-time-string to current-time-zone
  Paul Eggert
  Thu Dec 16 11:17:26 2021 -0800

- [X] dd0727e1ec1f535b9b06be88173b4d3ccd55abcb

  encode-time simplifications
  Paul Eggert
  Thu Dec 16 11:17:25 2021 -0800

- [X] 2d116c432d2a561fac69916d78b7a70dd6144ac7

  Merge from origin/emacs-28
  Stefan Kangas
  Sun Dec 12 06:31:07 2021 +0100

- [X] d601fd4692e0be3c9ee9b247c8a7bc5b2499f0eb

  Merge from origin/emacs-28
  Stefan Kangas
  Fri Dec 10 06:30:33 2021 +0100

- [X] c1145c31adf143460911dd87b408d35ea88a1a92

  Update org-compat doc string
  Paul Eggert
  Sun Dec 5 23:24:10 2021 -0800

- [X] 520a703fa7db07ba82661e68cf4eafe7ba61a8d0

  Merge from origin/emacs-28
  Stefan Kangas
  Sun Dec 5 06:30:35 2021 +0100

- [X] fa2e812894b999eba8afc4b146ca5e70fa9bd1c8

  Merge from origin/emacs-28
  Stefan Kangas
  Thu Dec 2 17:34:10 2021 +0100

- [X] f5498a608fe85b66a4068a5ccf88c9b3d3b88f98

  Merge from origin/emacs-28
  Stefan Kangas
  Sun Nov 28 14:59:44 2021 +0100

- [X] 1de6a86553c15905066a93e5b761e1825f23015a

  Merge from origin/emacs-28
  Stefan Kangas
  Sun Nov 21 11:18:23 2021 +0100

- [X] b4c6ab8cb67be4d5b3e0041981968c6cce4afe89

  Merge from origin/emacs-28
  Stefan Kangas
  Sat Nov 13 07:00:30 2021 +0100

- [X] 104e90d93664892ed1a7a1631c5b0141d0552a60

  Prefer locate-user-emacs-file
  Stefan Kangas
  Tue Nov 9 07:51:27 2021 +0100

- [X] 54fd811eecdd2ba5c1981c7b6c2108e4e2d2de5e

  Merge from origin/emacs-28
  Michael Albinus
  Sun Nov 7 18:06:24 2021 +0100

- [X] 0abf01402b4c1959b363ae1c7085fd356fb102a4

  Merge from origin/emacs-28
  Eli Zaretskii
  Sun Oct 31 18:46:29 2021 +0200

- [X] b931e11a03fdb44e378133b10f312e38b1b3d712

  Merge from origin/emacs-28
  Glenn Morris
  Sun Oct 24 01:55:45 2021 -0700

- [X] 7d12c06725d733f1ea223f5fe55d506c71e44370

  Merge from origin/emacs-28
  Glenn Morris
  Mon Oct 18 07:50:26 2021 -0700

- [X] 8aceb37b47a8f97fc42caaaf021ac06dc9f67827

  Merge from origin/emacs-28
  Glenn Morris
  Mon Oct 11 08:04:57 2021 -0700

- [X] 66409422214a0a90e1d2a12ef2c4ebf86f2c01a9

  Use format-prompt for many more prompts
  Stefan Kangas
  Tue Oct 5 03:44:56 2021 +0200

- [X] bd3a1c3134a130ca8edf4c13c44a8c2323ef2c90

  dummy marker for emacs-28 split

** emacs-28 [125/125]
:PROPERTIES:
:ref:      origin/emacs-28
:END:

- [X] 616dcf27e57388403d4c28d441bf7310bb665241

  ; Fix typos in Lisp symbols
  Stefan Kangas
  Tue Sep 20 12:21:40 2022 +0200

- [X] 19de241a7dc193c0d0423019824627adb28f8944

  Recommend NonGNU ELPA over MELPA
  Stefan Kangas
  Fri Sep 16 14:04:27 2022 +0200

- [X] 5713c730f201675918544dbe40ad308c5d0463c3

  Update to Org 9.5.5
  Kyle Meyer
  Sat Sep 3 21:32:20 2022 -0400

- [X] 582ea6a1e9f98c124a7b044f1db7d4c63da5646d

  Update to Org 9.5.4-19-g4dff42
  Kyle Meyer
  Sun Aug 21 17:35:35 2022 -0400

- [X] ba70d0f77c52d471bceb2ad2cc7bc172db348abb

  Update to Org 9.5.4-17-g6e991f
  Kyle Meyer
  Sun Jul 24 16:24:24 2022 -0400

- [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
  Kyle Meyer
  Sun Jun 26 23:00:38 2022 -0400

- [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.
  Stefan Kangas
  Wed Jun 8 13:16:32 2022 +0200

- [X] 1b8719835a200a2be17da226e82030f691caba80

  Update to Org 9.5.4
  Kyle Meyer
  Sat Jun 4 16:21:06 2022 -0400

- [X] f928330fa86e1493d2862180b132a99022458c96

  Update to Org 9.5.3-6-gef41f3
  Kyle Meyer
  Sun May 15 17:49:34 2022 -0400

- [X] 7c1fc2348918a1ad8c61c7519a51042d48d7aa8d

  Update to Org 9.5.3-3-gd54104
  Kyle Meyer
  Sun Apr 24 21:07:40 2022 -0400

- [X] 65c04e7115f329a083a16a364a8400e1685def61

  Update to Org 9.5.2-38-g682ccd
  Kyle Meyer
  Sun Apr 17 15:30:39 2022 -0400

- [X] f15922a57cd6177c9c945d3390a6b9918883415d

  Update to Org 9.5.2-25-gaf6f12
  Kyle Meyer
  Sun Mar 20 21:31:32 2022 -0400

- [X] cd77fd3b85f50b75d3fe24713a1ca4f622c110dd

  Update to Org 9.5.2-24-g668205
  Kyle Meyer
  Sun Mar 6 20:18:26 2022 -0500

- [X] e77fc8262ad73f30b1983f403262dce6f0e4cb09

  Update to Org 9.5.2-22-g33543d
  Kyle Meyer
  Mon Feb 28 00:11:01 2022 -0500

- [X] b7a651ba3787ab8257e35f93f754c4455fc8dba4

  Update to Org 9.5.2-17-gea6b74
  Kyle Meyer
  Sun Feb 20 14:04:28 2022 -0500

- [X] df3492934639628f023049e032421b7beb80de57

  Update to Org 9.5.2-15-gc5ceb6
  Kyle Meyer
  Sun Feb 13 12:43:54 2022 -0500

- [X] 6f282b31ad7548ab744565144e0d30dd56774210

  Update to Org 9.5.2-13-gdd6486
  Kyle Meyer
  Sun Jan 30 20:38:01 2022 -0500

- [X] e488601849627c53b1638fbab1d115518e0ee794

  Update to Org 9.5.2-9-g7ba24c
  Kyle Meyer
  Sat Jan 15 16:02:26 2022 -0500

- [X] f475c5823a409356721e49577116521467680ff4

  ; Copyright year fixes
  Glenn Morris
  Sat Jan 1 10:02:17 2022 -0800

  Already covered by update on Org side.

- [X] 19dcb237b5b02b36580294ab309124f346a66024

  ; Add 2022 to copyright years.
  Eli Zaretskii
  Sat Jan 1 02:45:51 2022 -0500

  Already covered by update on Org side.

- [X] d4e2850b323fdce7b4d658ece50f6071432deae8

  Update to Org 9.5.2-3-geb9f34
  Kyle Meyer
  Sun Dec 26 16:37:26 2021 -0500

- [X] 5f25852e91f167f99988fbe8d1944fe92d70b903

  Update to Org 9.5.1-31-ga18849
  Kyle Meyer
  Sat Dec 18 13:50:40 2021 -0500

- [X] 30dd5c9acc3b3b95ef784549b5e3ff8136a23854

  Update to Org 9.5.1-25-g9ca3bc
  Kyle Meyer
  Sat Dec 11 12:31:13 2021 -0500

- [X] 26fb4168b884eeb910580c42e87efb73399019c9

  ; Prefer HTTPS in more URLs
  Stefan Kangas
  Thu Dec 9 16:26:04 2021 +0100

- [X] c086358574e3671787394c7b9f6069760e7c6b3c

  Update to Org 9.5.1-15-gdb4805
  Kyle Meyer
  Sat Dec 4 21:27:59 2021 -0500

- [X] 50b40e1d4f0063ac78a53673736a2eaa3ba3287b

  ; * lisp/org/ob-julia.el: Fix Author header for authors.el.
  Stefan Kangas
  Wed Dec 1 17:03:52 2021 +0100

- [X] 1fffe9a210d328559da2af8facbb75286a31c74e

  ; * lisp/org/org.el: Fix version header.
  Stefan Kangas
  Sun Nov 28 14:54:24 2021 +0100

- [X] b8b2dd17c57b73357cae229e010138fd2352a46f

  Update to Org 9.5.1-11-g96d91b
  Kyle Meyer
  Sat Nov 27 16:25:09 2021 -0500

- [X] 0dd3883defc04ea02d2f77d79debf4e18157500d

  Update to Org 9.5-72-gc5d6656
  Kyle Meyer
  Sat Nov 20 13:12:18 2021 -0500

- [X] 42d4e24ff3f13ccbd401d93d70ecdee99b88a26d

  ; Fix typos
  Stefan Kangas
  Fri Nov 12 13:59:58 2021 +0100

- [X] f05b8a939b7ad57e9526510d510ff24484dcb520

  Update to Org 9.5-68-g77e2ec
  Kyle Meyer
  Sat Nov 6 14:10:47 2021 -0400

- [X] f1c9286376d570e898d349200412021fd67e13d2

  ; * doc/misc/org.org: fix capture context example
  Hanno Perrey
  Sun Oct 31 16:23:41 2021 +0100

- [X] 6fa520677095c5872f1d448f6f1001ee22e42276

  Update to Org 9.5-59-g52e6f1
  Kyle Meyer
  Sat Oct 23 13:46:59 2021 -0400

- [X] ac6ac76e3ae5ca96607ac7eba4a3ccf146fc8815

  Update to Org 9.5-57-g9bc3a2
  Kyle Meyer
  Sat Oct 16 14:01:34 2021 -0400

- [X] bcce93f04c2df6a5bb5dd1a8e611de734d24aee7

  Update to Org 9.5-46-gb71474
  Kyle Meyer
  Sat Oct 9 16:34:12 2021 -0400

- [X] bb209cd5ab819c72784de7278092705e59ff41d5

  Update to Org 9.5-30-g10dc9d
  Kyle Meyer
  Sat Oct 2 14:41:27 2021 -0400

- [X] 4341e79a5fad3e5e668a3eeb1b688d1986011481

  Remove bogus ":safe t" custom properties
  Glenn Morris
  Sat Oct 2 11:00:23 2021 -0700

- [X] 62d6cecfcd1a67e15a436c5c2b975f327d9a8b50

  Remove bogus ":safe nil" custom properties
  Glenn Morris
  Sat Oct 2 10:46:29 2021 -0700

- [X] f9111d8784bf12263abbe127cdfcbe5f409c9b3b

  The safe-local-variable property is a function (bug#50944)
  Glenn Morris
  Sat Oct 2 10:37:42 2021 -0700

- [X] bd60fca2faa03034e89df68a69255656df6512ba

  Fix ox-koma-letter compilation warnings
  Lars Ingebrigtsen
  Sat Oct 2 10:37:55 2021 +0200

  Already taken care of in the bugfix branch by 85e5540eb
  (lisp/ox-koma-letter.el: Use lexical-binding, 2021-09-30).

- [X] d505971894d83e04e8d206be1dcee1cee5e8bb93

  ; Standardize some license headers
  Glenn Morris
  Fri Oct 1 18:07:45 2021 -0700

- [X] f1f57a541e4c74eec68a27c47c7416ed6c7d75dd

  Fix some custom types
  Glenn Morris
  Fri Oct 1 08:33:32 2021 -0700

- [X] 2075411edbad954c0fdf2aa141757d834a6708b7

  Fix regexp snags in org
  Mattias Engdegård
  Thu Sep 30 17:16:41 2021 +0200

- [X] 58102466e32d4dd9c7d816cdc3f4595a2145f332

  org-element: use correct function
  Mattias Engdegård
  Thu Sep 30 17:16:25 2021 +0200

- [X] b5e3cc3bc597d56dfe09ee500717344649ea0354

  * lisp/org/ob-julia.el: Use lexical-binding
  Stefan Monnier
  Thu Sep 30 10:02:29 2021 -0400

- [X] a5b761ec334cded8252e81c3887142a46752ec6a

  * lisp/org/ox-koma-letter.el: Use lexical-binding
  Stefan Monnier
  Thu Sep 30 09:58:04 2021 -0400

- [X] bf9ec3d91a79414deac039f7bf83352a9b0a9a85

  Update to Org 9.5
  Kyle Meyer
  Wed Sep 29 23:21:21 2021 -0400

- [X] c78e16962e63895d340f80cf245fad568a7da770

  ; Adjust overly long docstrings to fit 80 characters
  Stefan Kangas
  Sun Sep 26 13:23:57 2021 +0200

- [X] 0da8118dcbf3c54dd6ecc9c0e3314a56ca82ec51

  Use command substitution instead of raw keys in more places
  Stefan Kangas
  Fri Sep 24 21:26:08 2021 +0200

- [X] 85e9e5f616fb0fd0819a04006d6d2a0fb6d93ad7

  Don't quote nil and t in doc strings and comments
  Lars Ingebrigtsen
  Tue Sep 21 22:11:43 2021 +0200

- [X] 43c1ee90cb3333dc2643e58cf607399b0abebf43

  Don't use `format' on strings without % format directives
  Lars Ingebrigtsen
  Tue Sep 21 17:52:53 2021 +0200

- [X] 3f9f3ba4370bd4d0f33392befb35328327d73b1e

  Docfix: use command substitution for 'universal-argument'
  Stefan Kangas
  Thu Sep 16 20:05:48 2021 +0200

- [X] 25ebb9374bdadf66153727831fc7ff131c8cf299

  ; More minor docfixes found by checkdoc
  Stefan Kangas
  Tue Sep 14 07:57:14 2021 +0200

- [X] ff4de1bd88b8be4a7071884910ff601eb10fbad5

  Fix quoting style in Lisp comments
  Eli Zaretskii
  Sun Sep 12 19:51:06 2021 +0300

  applied, but under discussion:
  <47d6e9a6-f334-eda9-2e08-0a946e51fc4a@yandex.ru>

- [X] fc4b956c7cb2fba8ed2a18865a7686c6cfa5d030

  ; Fix symbol quoting typos
  Stefan Kangas
  Sun Sep 12 18:36:49 2021 +0200

- [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
  Amin Bandali
  Sun Jul 4 00:14:47 2021 -0400

- [X] 19f2f2699499d87186c6f580e4ec79205d59c096

  Prevent Org mode from mistakenly changing Calendar keymap
  Stephen Berman
  Fri Jun 25 11:11:43 2021 +0200

- [X] 09ed51b9c89390059ccae30c0ae5dc39bc20523b

  * lisp/org/org-timer.el (org-timer--run-countdown-timer): Use closures
  Stefan Monnier
  Tue May 18 19:54:38 2021 -0400

  Independently applied to master in 1a5a326f1.  Also applied to
  km/from-emacs-master.

- [X] 5746fd57ab7c9d27bcc6220f2b9faaba2982deba

  * lisp/org/org-mouse.el: Make use of lexical scoping
  Stefan Monnier
  Tue May 18 19:51:26 2021 -0400

- [X] 4e240bf09678a41055e46fb16a798541d58d372e

  * lisp/org/org-colview.el (org-columns-map): Use proper closures
  Stefan Monnier
  Tue May 18 19:36:54 2021 -0400

  Independently applied to master in 71c40314f.  Also applied to
  km/from-emacs-master.

- [X] af68b49565671821361d089ae9a68af32d760e2c

  * lisp/org/org-clock.el (org-clock-get-table-data): Use proper closures
  Stefan Monnier
  Tue May 18 19:32:35 2021 -0400

  Independently applied to master in 038aff34d.  Also applied to
  km/from-emacs-master.

- [X] 0a4dc70830f5e8286b47120cabc750cca07a75c1

  ; Normalize and add missing first and last lines
  Stefan Kangas
  Mon Apr 19 12:21:01 2021 +0200

- [X] c45bfd3c4abbfa585c9199f4866b6b8046945117

  * lisp/**/*.el: Avoid positional args to `define-minor-mode`
  Stefan Monnier
  Sun Apr 11 23:47:14 2021 -0400

- [X] 331ddd803a72056d0f0c70e5a677e0d4a6300584

  Address some --without-x byte-compilation warnings
  Basil L. Contovounesios
  Fri Mar 26 17:35:34 2021 +0000

- [X] f1f351def3d84813d2c4b2174dfef07b01bec058

  Update rnc to use Open Document's Relax-NG schema to version 1.3
  Mark A. Hershberger
  Thu Mar 25 11:49:18 2021 -0400

  https://orgmode.org/list/87o8d07mpr.fsf@kyleam.com

- [X] 8b07994e201e478df8a3431cbae5187b4cde1791

  Convert many more links to use HTTPS
  Stefan Kangas
  Wed Mar 24 10:20:18 2021 +0100

- [X] 1ae8a18d949e3a3dc3f7a6f2284ecb35871416ca

  Use lexical-binding in two trivial org-mode files
  Stefan Kangas
  Wed Mar 24 06:35:33 2021 +0100

  Already covered by a50a42cea (Use lexical-binding cookie in some
  trivial files, 2021-01-24).

- [X] a0854f939ce3a1de2c8cbc5e38b106a8df4480f6

  ; Fix typos in doc strings
  Mattias Engdegård
  Fri Mar 12 12:12:14 2021 +0100

- [X] 7d0dc31833d471a6f86e947d3165d3fd1452a184

  * lisp/org/: Delete some always-nil variables
  Stefan Monnier
  Thu Mar 11 13:07:37 2021 -0500

- [X] 18e1455c8ae851791a047dc56eef972cc24e5b6c

  Make generation of texi from org overwrite output
  Glenn Morris
  Sun Feb 28 15:13:07 2021 -0800

- [X] b34d39170b67a7a285f7c8c2ea1b4128b531aad9

  Minor fixes after preloading easymenu
  Stefan Kangas
  Sat Feb 27 20:04:41 2021 +0100

- [X] 2c639a35a6d71d190bea896bbeb14b279e8d8384

  Don't require overlay; that's only needed in XEmacs
  Stefan Kangas
  Sat Feb 27 18:23:12 2021 +0100

- [X] fddd63f8b854f6bfa91403f69ba694ccb54197bc

  Distribute the real source for some doc/misc manuals (bug#45143)
  Glenn Morris
  Fri Feb 26 19:36:09 2021 -0800

- [X] 8d5dfafab7dc40d4b74dc0b56d1b314fd8cac390

  Prefer `declare` over a `put` of `list-indent-function`.
  Stefan Monnier
  Mon Feb 22 11:54:17 2021 -0500

- [X] de15ca7d0065c5f77c88a90f4f14569886be3617

  Fix typos
  Mattias Engdegård
  Thu Feb 18 16:50:55 2021 +0100

- [X] f8dbefbaa59bb17dd4a2dfa4d9ff560c46785792

  Use `declare` instead of `def-edebug-spec` in most places
  Stefan Monnier
  Fri Feb 12 16:08:01 2021 -0500

- [X] ce35760b19315b634e62e2c64988018189dcdbdc

  ; Minor license statement fixes
  Stefan Kangas
  Mon Feb 8 09:10:57 2021 +0100

- [X] bbe88cd82e4bbfd76df06223614ab74d1022c119

  Assume font-lock-mode variable is not void
  Stefan Kangas
  Fri Feb 5 01:15:02 2021 +0100

- [X] a8caa66906b157c9c2b4c4dc1c447b6a9e747c5e

  Avoid recommending Google
  Stefan Kangas
  Thu Jan 28 19:36:12 2021 +0100

- [X] ba05d005e5a81bc123ad8da928b1bccb6b160e7a

  Update copyright year to 2021
  Paul Eggert
  Fri Jan 1 01:13:56 2021 -0800

  Already covered on Org's side (99eafe378).

- [X] dd662fc972a75df71cdaa25a2d763d1592df1eb8

  Fix some over-wide docstrings
  Stefan Kangas
  Wed Dec 30 12:44:19 2020 +0100

- [X] 90ec81f5b243b6b7b3ebe2de394b20e8078ebc96

  Merge from origin/emacs-27
  Glenn Morris
  Fri Dec 25 10:36:48 2020 -0800

- [X] 2e20749e57164982df962c8f373e98bb40dd7d19

  Merge from origin/emacs-27
  Glenn Morris
  Fri Dec 25 10:36:48 2020 -0800

- [X] 34a73666d9559d948815a53b63dc36cc878d5aff

  Shorten some over-wide docstrings in functions and macros
  Stefan Kangas
  Sat Dec 19 18:21:06 2020 +0100

- [X] f88a7897a80ee9129bdc444cafff32d026c4b6d8

  Shorten over-wide docstrings in variables
  Stefan Kangas
  Sat Dec 19 18:21:06 2020 +0100

- [X] 5ab5c3898778406103e7183bf41c7d018077092b

  Shorten over-wide docstrings in defcustoms
  Stefan Kangas
  Sat Dec 19 18:21:06 2020 +0100

- [X] 64d97212f42bc0305560a0ae2cc2f16a3a851117

  Fix over-wide doc strings
  Eli Zaretskii
  Sat Dec 19 13:18:11 2020 +0200

- [X] 8d2d8d7f53055d93ed2d8a435533c9a6a6303725

  Merge from origin/emacs-27
  Glenn Morris
  Fri Dec 18 08:55:06 2020 -0800

- [X] 46394dff7f01e7fe4af06a6c344e151af5c3eef4

  Follow good regexp practice
  Mattias Engdegård
  Fri Dec 18 14:35:09 2020 +0100

- [X] 5ada3eecec79703a84e2f2c38cae16ef4b2600cc

  * lisp/org/org-refile.el (org-copy): Fix missing obsoletion version
  Stefan Monnier
  Thu Dec 17 18:21:47 2020 -0500

  Applied despite hold for compatibility with Emacs 28 following
  32c6732d16 (* lisp/emacs-lisp/byte-run.el (make-obsolete): Make
  `when` mandatory, 2021-01-03).

  https://orgmode.org/list/87o8i2cpb2.fsf@gmail.com

- [X] cbdd48a07be5401177807ed6e6b8ec16c1b5e004

  Merge from origin/emacs-27
  Glenn Morris
  Tue Dec 15 09:24:21 2020 -0800

- [X] 0a4aa2894297c0fd9e735328bbb60b427e0ba5d4

  Remove redundant requires of 'font-lock'
  Stefan Kangas
  Thu Dec 3 08:50:14 2020 +0100

- [X] 67a8bdb90c9b5865b7f17290c7135b1a5458c36d

  Use null-device where appropriate
  Michael Albinus
  Wed Nov 25 22:13:33 2020 +0100

- [X] affe9b225de711429248a73f920dc9f38b15c932

  Make XEmacs compat aliases easy-menu-{add,remove} obsolete
  Stefan Kangas
  Tue Nov 24 18:06:05 2020 +0100

- [X] 430eb2f850b26f7df8473de4d929b5665673a0a2

  Remove Emacs 20 compat code from org.el
  Stefan Kangas
  Fri Nov 20 16:11:33 2020 +0100

- [X] 844e82f5a837a16c64e32ff9dd41a9e9b3ad3432

  * lisp/org/ob-ruby.el (org-babel-ruby-initiate-session): Use :ruby header arg.
  Juri Linkov
  Sat Nov 14 22:18:38 2020 +0200

  Required resolving conflicts with 3ce495cc4 (ob-ruby.el: allow
  specification of ruby command w/header arg, 2020-10-20).

- [X] 61dca6e92ac972b832e889fbeab9b6131fc896fa

  Don't quote lambdas in several places
  Stefan Kangas
  Sat Nov 14 17:04:23 2020 +0100

- [X] 79d04ae13ff33a93f631061d912168e9703251dd

  Don't set file name variable in org-element-parse-secondary-string (bug#44524)
  Juri Linkov
  Tue Nov 10 21:27:37 2020 +0200

- [X] dd16e46bb9d0099baea06d780ad8f62728addc2e

  ; Prefer https to http in more URLs
  Stefan Kangas
  Sat Oct 24 20:23:27 2020 +0200

- [X] 4a575eb18cca3eed5019f2d2d2abeea1f0c07005

  byte-compile-file: Make optional LOAD argument obsolete
  Stefan Kangas
  Tue Oct 20 18:48:27 2020 +0200

- [X] ceae38b9338ea07b18b2d2efa07bcf304d40c23d

  ; Fix trivial typos in ChangeLogs
  Stefan Kangas
  Sat Oct 3 12:53:51 2020 +0200

  changelog only

- [X] 726eb835ddcbc209545f681d7272ebaa13788b33

  Merge from origin/emacs-27
  Glenn Morris
  Fri Oct 2 09:38:24 2020 -0700

- [X] c6fa0ad315e38167cb81a4d8c143cc53ad783cc3

  ; Prefer https to http in many URLs
  Stefan Kangas
  Thu Oct 1 15:28:15 2020 +0200

- [X] f103e89c1d2c4610f2f6812bdbef65c308d143d9

  Add aliases for recent Gnus nnselect changes
  Andrew G Cohen
  Mon Sep 7 09:05:04 2020 +0800

  Add alternative that's backward compatible: 824a4a14b (ol-gnus:
  Prefer nnselect to nnir if available, 2020-09-07)

- [X] 00be23c2af4aa1bb09afc6404c5ef68997dc18f5

  Don’t attempt to modify constant strings
  Paul Eggert
  Sun May 17 16:51:46 2020 -0700

- [X] 7f1dae114dffbf4bdec60e38ada4eb0673cfb4e2

  Fix effect-free warning in ob-screen.el while loop
  Basil L. Contovounesios
  Fri Apr 17 11:38:25 2020 +0100

  Handled separately by ee1f73ee1 (ob-screen.el: Fix compiler warning,
  2020-02-12).

- [X] 6a60701bba3d87f5d9a1730e18b6da827f41a062

  Improve regexp in org-table-finish-edit-field
  Mattias Engdegård
  Thu Apr 16 19:53:10 2020 +0200

- [X] d5a7df8c02f04102d50a5cd2290262f59f2b1415

  Use directory-files-no-dot-files-regexp wherever possible
  Mattias Engdegård
  Thu Apr 16 12:14:38 2020 +0200

- [X] 905c0a13f7929298cb36151f46dbef03f7bdcbe4

  Fix bugs, inefficiencies and bad style in regexps
  Mattias Engdegård
  Thu Apr 16 12:14:38 2020 +0200

- [X] 97e48510ad4fec9ca5f576a750018a231523f7a6

  Merge from origin/emacs-27
  Glenn Morris
  Wed Apr 15 07:50:15 2020 -0700

- [X] 22524a6e39582d44c1365bad9a589618c2b0df27

  Fix mistake in regexp cleanup
  Mattias Engdegård
  Tue Feb 25 12:04:40 2020 +0100

  Doesn't apply.

- [X] 770f76f050376bbd77a3cc8cf44db57cf855a27c

  Remove subsumed repetitions in regexps
  Mattias Engdegård
  Thu Feb 20 16:05:18 2020 +0100

- [X] a13d1f953980b516470d03ab23250760c581c05b

  Merge from origin/emacs-27
  Glenn Morris
  Thu Feb 13 07:50:30 2020 -0800

- [X] 56ce263f506fede328888a321a12b1f85f46d0d5

  Merge from origin/emacs-27
  Glenn Morris
  Thu Feb 13 07:50:24 2020 -0800

- [X] 68d43392a65186a944c839dc576b2b01deafbb0d

  Merge from origin/emacs-27
  Glenn Morris
  Thu Feb 6 07:50:29 2020 -0800

- [X] 0c6c8aa002d321db61afdd14c70744f7bc27f268

  Remove (or double) redundant backslashes in string literals
  Mattias Engdegård
  Fri Jan 24 23:04:34 2020 +0100

- [X] e135414b271e71c16e28efc2e3f29b803ab67424

  Replace doc references to load-hooks
  Glenn Morris
  Thu Jan 16 21:53:37 2020 -0800

- [X] f9094332287cf1434788f6407347265350ae5dd5

  Merge from origin/emacs-27
  Paul Eggert
  Sun Jan 5 11:44:48 2020 -0800

- [X] c6fb86b40bebf597fccbe4eba58ceea83bd9700f

  Merge from origin/emacs-27
  Paul Eggert
  Wed Jan 1 01:08:16 2020 +0000

- [X] af085ef40b961ca3466e8b2dfb7f722573e5a4cc

  Use regexp type for regexps in defcustom declarations
  Mattias Engdegård
  Thu Dec 26 16:50:58 2019 +0100

- [X] b0f20651e3cbb8a66f11ffae4c18634019c20cd4

** emacs 27 branch [146/146]
:PROPERTIES:
:ref:      origin/emacs-27
:END:

- [X] 348b2aed0c8c3630be4c15c8e70acf7ea9c023af

  Update IRC-related references to point to Libera.Chat
  Amin Bandali
  Sat Jul 3 23:39:18 2021 -0400

- [X] 8c1fe1e5efa2bbaeab2cf141bd31f09abe63d4c4

  Update copyright year to 2021
  Paul Eggert
  Fri Jan 1 00:32:32 2021 -0800

  Already covered on Org's side (99eafe378).

- [X] b242bbb073b501f7a4d4569c2d70cde522abbea3

  ; lisp/org/org.el: Fix Version header.
  Glenn Morris
  Fri Dec 25 10:36:25 2020 -0800

  Must have been issue on sync because post-image is already the state
  on Org's side (maint and emacs-sync branch).

- [X] 7f8793e5f1c69cf9311479e69d18a62ae87e35ce

  Update to Org 9.4.4
  Bastien Guerry
  Tue Dec 22 10:29:37 2020 +0100

- [X] 7cacf5da47d1f88bbaef07e10841d1f6bfe2e471

  Update to Org 9.4.3
  Bastien Guerry
  Wed Dec 16 19:17:58 2020 +0100

- [X] 2dbc95063b5ee3d48aceff05f89e63a134df86ed

  Update to Org 9.4.2
  Bastien Guerry
  Sun Dec 13 22:26:51 2020 +0100

- [X] f22856a5c54d99867cd24c08a14bbda23d5c6229

  Update to Org 9.4.1
  Bastien Guerry
  Sun Dec 13 13:44:15 2020 +0100

- [X] 78eacf31e8fe182801ad1943fac717b75fcf286b

  ; Fix many typos in symbols in docs and comments
  Stefan Kangas
  Fri Oct 2 13:29:45 2020 +0200

  Cherry picked to emacs-sync (9.3.9-based) since maint is now 9.4, so
  that a sync doesn't overwrite.

- [X] 4acdd7fe58ae9f94102afeca67b0383141d597da

  Fix edge case errors in filename-matching regexps
  Mattias Engdegård
  Tue Apr 14 12:25:16 2020 +0200

  Superseded by another commit (on master).

- [X] 0304f530761bee1c217bbf8fe7839cdfe8767a51

  doc/misc/org.texi: Fix @dircategory
  Bastien
  Thu Feb 13 09:41:38 2020 +0100

  already handled on Org's side

- [X] 530067463bffc982f02dcc4f2805d389704575b4

  Correct "different than" to "different from" where appropriate
  Alan Mackenzie
  Sun Feb 9 14:33:14 2020 +0000

- [X] 32763dac46e61cc34e8fe4d19df4905d09c1a27f

  Replace add-to-list to lexical variable with push (bug#39373)
  Mattias Engdegård
  Sat Feb 1 22:27:23 2020 +0100

- [X] 088bfcc2d80eed44864147f3491eff69e4eb5cd8

  Move “Fix some broken conditional forms” to master
  Paul Eggert
  Sun Jan 5 11:50:31 2020 -0800

- [X] f95a2b83014a810d508448473b20186d55485efd

  Fix some broken conditional forms
  Paul Eggert
  Sat Jan 4 11:18:13 2020 -0800

  Already fixed by Bastien in 04bd110b2 (Small fixes, 2020-01-31).

  Reverted by above commit.

- [X] 4cd143aded5e40fe801575c669dd464210caaf7e

  Fix copyright years by hand
  Paul Eggert
  Wed Jan 1 01:01:53 2020 +0000

  covered independently on our side

- [X] 365e01cc9f64ce6ca947ccfd8612d60763280a37

  Update copyright year to 2020
  Paul Eggert
  Wed Jan 1 00:59:52 2020 +0000

  covered independently on our side

- [X] b0f20651e3cbb8a66f11ffae4c18634019c20cd4

  ; Spelling fixes
  Paul Eggert
  Tue Dec 10 20:05:49 2019 -0800

- [X] d1a791f8edc1b8f2189b6f1b3be7b946fef1edbc

  Spelling fixes
  Paul Eggert
  Mon Dec 9 18:45:18 2019 -0800

- [X] 4c933077157ba409d645f4649c8a3a8e534d53d5

  2019-12-05 regexp lint fixes
  Paul Eggert
  Thu Dec 5 19:32:12 2019 -0800

- [X] ab612302b4917fec5846922f3d8ffafa673c0d36

  Fix regex repetition of repetitions
  Paul Eggert
  Wed Dec 4 16:54:24 2019 -0800

- [X] 0ca32d1270bd5d494e365f3525fa65ac423f6658

  etc/ORG-NEWS: Fix contents
  Bastien
  Wed Dec 4 17:09:02 2019 +0100

  fix discussed with bastien in [[notmuch:id:874kygm5fr.fsf@bzg.fr]]

- [X] 23053770449ba1af24961a11d803ae5e948130b6

  ; etc/refcards/orgcard.tex: Fix header
  Bastien
  Wed Dec 4 10:42:58 2019 +0100

  emacs-specific

- [X] 8fb773cc919e02e06cb1640448f4d8be19c61b30

  Silence warnings in Org 9.3
  Juanma Barranquero
  Wed Dec 4 07:05:14 2019 +0100

  covered by Bastien with 46319b5f69e2ef912fa6024a558a6e2b5b14ed48

- [X] 94c5eeb1fd33b043f68c4021fa0aed0e5590763e

  ; Fix copyright years and license notices for recent org files
  Glenn Morris
  Tue Dec 3 17:19:14 2019 -0800

- [X] 165f7383822086d465519ebe6e4283723923f097

  Update Org to 9.3
  Bastien
  Tue Dec 3 23:27:04 2019 +0100

  skipped

- [X] 5bc97ebceb54e0eb2804bef4c1bc32a40d8a2371

  * lisp/org/org.el (org-mode): Add pcomplete-completions-at-point to capf.
  Stefan Monnier
  Mon Nov 18 17:47:06 2019 -0500

- [X] 6b4a97c1c78f39ce890d100acceceb652d14e20d

  Fix some quoting glitches in doc strings
  Paul Eggert
  Mon Nov 11 10:32:53 2019 -0800

- [X] 41ba8231ef072571e1a6feabc15d113e5cf57556

  lisp/*.el: Fix typos and improve some docstrings
  Juanma Barranquero
  Sun Oct 20 12:12:27 2019 +0200

- [X] 946a56a10fed769646a8b7c4ebc53f53c84be896

  Update some URLs
  Paul Eggert
  Mon Sep 23 00:12:52 2019 -0700

- [X] 11432322650830fe9ae365f4113733a79226056d

  lisp/*.el: Fix typos and other trivial doc fixes
  Juanma Barranquero
  Sat Sep 21 00:27:53 2019 +0200

- [X] 79a01866a01754b9f566af76ef96e80cd90d094b

  lisp/*.el, src/*.c: Fix typos in docstrings
  Juanma Barranquero
  Thu Sep 19 04:32:25 2019 +0200

- [X] 221a3272ad4a1befb41dda2990d672782bc0257f

  Fix org-table 65536-second bug
  Paul Eggert
  Mon Aug 19 18:05:15 2019 -0700

- [X] 3d1c9a77c52664c8c3e4fa1ae25e1d13aab9b2f9

  Fix org-timer-show-remaining-time > 1 hour
  Paul Eggert
  Sat Aug 17 17:22:25 2019 -0700

- [X] c90a420779448fecf1941f063da3e8276dc3d0d7

  Add FIXMEs for subsecond support
  Paul Eggert
  Sat Aug 17 15:43:05 2019 -0700

  superseded by next commit

- [X] 37257d6acadff17bd1e52cfa460950bcb684c5c3

  More-compatible subsecond calendrical timestamps
  Paul Eggert
  Fri Aug 16 23:25:07 2019 -0700

  Some of the code in question was removed from
  org-parse-time-string in e1884a098 (org-macs: Tiny refactoring,
  2018-07-01).

  This reverts part of b06917a4912a60402025286d07d4a195749245c4, but
  think the other part is also unnecessary.

- [X] c676444a43e4634c1f98ec286b5bd9e46b23216b

  Add conditional operator xor to subr.el
  Mattias Engdegård
  Tue Aug 6 13:38:47 2019 +0200

  Made alternative commit.  That targeted stale code.

- [X] b06917a4912a60402025286d07d4a195749245c4

  decode-time now returns subsec too
  Paul Eggert
  Mon Aug 5 18:37:29 2019 -0700

  Irrelevant with 37257d6acadff17bd1e52cfa460950bcb684c5c3.

- [X] 89c63b3522b62c0fd725f0b348927a2069238452

  New function time-convert
  Paul Eggert
  Mon Aug 5 18:37:29 2019 -0700

  marked

- [X] c6ba8100ea1db4616d3fe8485430b29143bc3d2e

  Fix minor Org timestamp inefficiencies
  Paul Eggert
  Mon Aug 5 17:38:15 2019 -0700

- [X] a5b796a8798a809044d847568e6472cc5eca077e

  Fix 2019-08-04 regex lint
  Paul Eggert
  Sun Aug 4 11:39:54 2019 -0700

- [X] 5f3f3884a0d2a88101d330b82ef5b584cfc02aa6

  Improve time function doc
  Paul Eggert
  Sun Aug 4 10:09:25 2019 -0700

- [X] 2267110b6f00bbb0ad87f4621e6ecd9dc1bd8581

  Fix usage of remove-text-properties
  Basil L. Contovounesios
  Thu Aug 1 17:04:53 2019 +0300

- [X] 7e294d55e1506443e711f44c85caf490ded80fe8

  Remove some obsolete integer overflow handling
  Mattias Engdegård
  Mon Jul 22 19:26:21 2019 +0200

  Waiting for Mattias to respond to [[notmuch:id:875zntwhe2.fsf@kyleam.com][this email]].

  Only compatible with Emacs 27.  Added note.

- [X] fb48eb48f3bd432307821bc7158d1090f0e4bbf0

  Fix minor typo in org-capture-templates
  Ismail S
  Tue Jul 9 00:53:18 2019 +0200

- [X] dfc322d77fd1ce3aa4d852e0ff07bb36944f6432

  Replace manually crafted hex regexes with [:xdigit:]
  Konstantin Kharlamov
  Sat Jul 6 10:54:25 2019 +0300

- [X] 0b4e003766f15225dede9bdba4ead33e493856e2

  Revert "* lisp/calc/calc-ext.el (math-scalarp): Fix typo"
  Stefan Monnier
  Wed Jun 26 10:24:59 2019 -0400

  Not sure this was a clean revert of the changes, but doesn't matter
  because I didn't apply the initial patch.

- [X] 698ff554ac2699ec48fefc85a1307cbc4a183b0d

  * lisp/calc/calc-ext.el (math-scalarp): Fix typo
  Stefan Monnier
  Wed Jun 26 10:03:48 2019 -0400

  Not sure what happened here, but ignoring since it was at least
  said to be reverted in next commit.

- [X] 17a1dae4af751c82e78991350559481e9fa42959

  Merge from origin/emacs-26
  Glenn Morris
  Sat Jun 1 12:04:41 2019 -0700

- [X] 852d28176990d035366142bfde36a0440a317228

  Update author/maintainer info
  Paul Eggert
  Sun May 26 01:00:16 2019 -0700

- [X] 797ee5871e458d6d97f57a24405412a053f5ef32

  Remove Maintainer: when it duplicates Author:
  Paul Eggert
  Sun May 26 01:00:15 2019 -0700

- [X] 5424436452bc0b3d8a62a8398f92d0c2db81e22b

  Avoid backslash-newline-newline in source code
  Paul Eggert
  Wed May 22 23:59:36 2019 -0700

- [X] bef1be873009d6e9f5a097396179f63a565bb6fd

  Fixes for "Maintainer:" and related lines
  Paul Eggert
  Sun May 19 21:34:27 2019 -0700

- [X] 7ddd08bd3ebc48998062a7d29274cf080256a48f

  Omit/rewrite useless regexp repetitions
  Paul Eggert
  Fri Apr 12 19:43:41 2019 -0700

- [X] f9ff60e0d7288e30cdbd1e43225059f1374441f1

  Improve regexp advice again, and unchain ranges
  Paul Eggert
  Tue Apr 2 15:01:34 2019 -0700

- [X] e14c0d748efe35afc653151ff18c4dd93dcc456e

  More minor regex cleanup
  Paul Eggert
  Tue Mar 19 18:47:53 2019 -0700

- [X] bc2a93d5b7c3d749b31927452e31b32bdb1b9108

  Fix more regular expression typos
  Paul Eggert
  Mon Mar 18 17:02:29 2019 -0700

- [X] 8832cc5f91a420db6bea65f381a3fb3597eb7523

  Fix some ineffective backslashes in string literals
  Mattias Engdegård
  Sat Mar 16 11:38:58 2019 -0700

- [X] db9c924d3d53f46846ad8fd74a5d08f4586a520e

  More regexp corrections and tweaks
  Paul Eggert
  Fri Mar 8 09:09:40 2019 -0800

- [X] 3739d51ef3b935b30e40ba4534fe362bc685865f

  Be safer about "%" in message formats
  Paul Eggert
  Thu Mar 7 09:05:56 2019 -0800

- [X] 3c94c7bc02fcacb4a101188dddb0c44d53444178

  Fix regular-expression glitches and typos
  Paul Eggert
  Mon Mar 4 18:00:58 2019 -0800

- [X] 476066e89d6f0bb87220da690b8a476bf9655b80

  Avoid some double-rounding of Lisp timestamps
  Paul Eggert
  Fri Feb 22 18:33:57 2019 -0800

  much of this couldn't apply.  and if it could, couldn't be used
  because of compatibility

- [X] eba66c1eafeef6512259c9b46face2b03c7433b8

  Remove some timestamp format assumptions
  Paul Eggert
  Fri Feb 22 13:31:01 2019 -0800

- [X] 83a9133e35827c1edbd8bf24a17ffa3b4bfb7be3

  Merge from origin/emacs-26
  Glenn Morris
  Wed Feb 20 12:07:22 2019 -0800

- [X] 988e37fa0f922b852715671d59a0e3f682373411

  Simplify use of encode-time
  Paul Eggert
  Sun Feb 10 23:54:35 2019 -0800

- [X] 57c74793c46c6533b63836f00aecaf3ac2accb6d

  Prefer encode-time to its alias
  Paul Eggert
  Sun Feb 10 23:54:34 2019 -0800

  encode-time with one argument is incompatible even with 26.1

- [X] ba809612c06bcabd05dcbaae79da39dcb0925992

  Merge from origin/emacs-26
  Paul Eggert
  Mon Dec 31 17:57:29 2018 -0800

- [X] c5e02f2bce28f3b1f2006ce1f208f4a92ca05ed9

  Make org-protocol-flatten always an alias
  Paul Eggert
  Mon Dec 17 13:32:52 2018 -0800

- [X] ef144113f3473f39d3df3e96e780c832e0d5420e

  Some more flatten-tree aliases
  Paul Eggert
  Mon Dec 17 10:26:15 2018 -0800

- [X] d28118940ccdd8772b948880011dd4158ed20463

  Revert "Replace insignificant backquotes" for Org files
  Michael Heerdegen
  Mon Nov 26 21:43:23 2018 +0100

  checked that this is a complete revert by diffing
  1808d254^..d2811894 -- lisp/org/

- [X] 1808d254a5820e8c650013033f800ca2990cd239

  Replace insignificant backquotes
  Michael Heerdegen
  Sun Nov 25 21:08:08 2018 +0100

- [X] 93fe420942c08111a6048af7c4d7807c61d80a09

  New (TICKS . HZ) timestamp format
  Paul Eggert
  Sat Oct 6 23:31:04 2018 -0700

- [X] f5621181111ba7cc58967ee9b1cfa08020d3e3ea

  Merge from origin/emacs-26
  Glenn Morris
  Wed Oct 3 09:25:26 2018 -0700

- [X] 6aa93b45af9fb3631fb8fb6a04407db4d9a74107

  Merge from origin/emacs-26
  Glenn Morris
  Fri Sep 28 07:54:24 2018 -0700

- [X] 662bee7d70ccd3903e123b08c7ec9108a1a2ce0b

  file-attributes cleanup
  Paul Eggert
  Sun Sep 23 18:32:59 2018 -0700

- [X] a4a3c92e9de59bd0251f36326375cce898919edc

  Prune most-positive-fixnum from Lisp source
  Paul Eggert
  Wed Aug 22 20:46:08 2018 -0700

- [X] f18af6cd5cb7dbbf7420ec2d3efed4e202c4f0dd

  Audit use of lsh and fix glitches
  Paul Eggert
  Tue Aug 21 13:44:32 2018 -0700

- [X] 2fde6275b69fd113e78243790bf112bbdd2fe2bf

  Add predicate proper-list-p
  Basil L. Contovounesios
  Mon Jul 9 19:00:43 2018 -0700

  but we can't add this unless we add a compatibility kludge

- [X] 02c7d45d490dd28a1c4effa928f9a8b9373149b0

  Merge from origin/emacs-26
  Glenn Morris
  Sat Jun 2 10:29:37 2018 -0700

- [X] 3c6b59918aaaac295fd6354dae929859eaaacfa2

  Backspace is not a paragraph separator in Texinfo files
  Paul Eggert
  Mon Apr 23 10:45:13 2018 -0700

- [X] 18de2ada243653ece98b18044233e5d29eee5903

  More alias-related tedium
  Glenn Morris
  Fri Apr 20 18:55:04 2018 -0400

- [X] 9c3eeba4db26ddaeead100beea7a96f9fa640918

  The tedious game of whack-a-mole with compiler warnings continues
  Glenn Morris
  Fri Apr 20 18:34:39 2018 -0400

- [X] 2a8f8f75639505b0f04757a1034480843fbd8398

  Merge from origin/emacs-26
  Glenn Morris
  Fri Apr 20 08:07:43 2018 -0700

- [X] 20b858ef13f8f71fae6cbce5cdac31c4dd130600

  Prefer \... to control chars in .el literals
  Paul Eggert
  Thu Mar 29 17:43:08 2018 -0700

- [X] fde99c729c46c775dbdfe5bebf857c67138ae7f0

  Port recent org-clock fix to POSIX time_t
  Paul Eggert
  Wed Mar 28 15:04:50 2018 -0700

  this makes test-org-clock/clocktable/ranges fail

  Will skip in favor of my patch:
  [[notmuch:id:20181228213627.387-1-kyle@kyleam.com]]

- [X] 7d8234c0cb9daac31ae2f660f503a3ede7324549

  Merge from origin/emacs-26
  Glenn Morris
  Wed Mar 28 09:38:22 2018 -0700

- [X] c8e8d16810ec09139c560c77572d3372a2edd8d2

  Avoid using unportable integer in org-clock
  Paul Eggert
  Tue Mar 27 13:48:36 2018 -0700

  Doesn't apply.  org-clock--oldest-date was removed in ffa5f3c51
  (org-clock: Improve `untilnow' range behavior and performance,
  2018-01-21).

- [X] 6695c1be51bd8a1e208ae02505b2a6fa64c85e68

  Merge from origin/emacs-26
  Stefan Monnier
  Fri Mar 23 11:01:31 2018 -0400

- [X] 1c7db8aa30969d0bc0e6d35b9bd57c70314ed9d0

  Explicitly require cl-lib where needed
  Glenn Morris
  Fri Mar 16 20:41:17 2018 -0400

- [X] b1d7e58520dc42a4eda902aa934a250fda6a04ca

  Replace some obsolete uses of filter-buffer-substring-functions
  Glenn Morris
  Thu Mar 15 20:23:09 2018 -0400

- [X] a3f26048a9b115e8dabffaa768128eaccd07dfd3

  Merge from origin/emacs-26
  Paul Eggert
  Sat Mar 10 18:30:54 2018 -0800

- [X] 136e1d23e936598a1c988cfa4b1d81ea7f7cb1f9

  uniqify -> uniquify
  Paul Eggert
  Sun Mar 4 18:01:41 2018 -0800

- [X] bd6c1976fba03bd2e4ca0a52cea562c8ecf23ef8

  Merge from origin/emacs-26
  Paul Eggert
  Sun Mar 4 17:16:39 2018 -0800

- [X] d5f6ff99c2b594919931b277a2d94d3a289ca764

  Quieten without-x org compilation
  Glenn Morris
  Wed Feb 28 16:55:41 2018 -0500

- [X] 3959892419eff45a7006deceddcc1962fdbcc1c9

  Merge from origin/emacs-26
  Glenn Morris
  Wed Feb 28 09:40:40 2018 -0800

- [X] 4fa90ff8f5fda54fc42049c990c52d3e5236fbe6

  Merge from origin/emacs-26
  Glenn Morris
  Sat Feb 17 07:50:28 2018 -0800

- [X] 24acb31c04b4048b85311d794e600ecd7ce60d3b

  Add early init file, stop package-initialize insertion
  Radon Rosborough
  Sat Feb 17 13:36:16 2018 +0200

- [X] a0c7157a16481b0523ad20cda9115f9435188f73

  Merge from origin/emacs-26
  Glenn Morris
  Mon Feb 5 07:50:22 2018 -0800

- [X] 084cfae0e624469ebca78b155ffe4e2c20f2b205

  Merge from origin/emacs-26
  Glenn Morris
  Tue Jan 30 07:50:25 2018 -0800

- [X] 35675bb93f4620c43ca766e8a2d8708fd323c684

  Merge from origin/emacs-26
  Paul Eggert
  Mon Jan 22 08:43:54 2018 -0800

- [X] 72ee93d68daea00e2ee69417afd4e31b3145a9fa

  * src/print.c (syms_of_print) <print_quoted>: Set default to true
  Stefan Monnier
  Mon Jan 15 13:42:51 2018 -0500

  will wait for rc

- [X] fe15532eef5e7375fd2d91b92e173e5ed12534ef

  * lisp/org/org-element.el: Add comment about use of internal functions
  Stefan Monnier
  Thu Jan 11 11:33:03 2018 -0500

  Sent to list instead: [[notmuch:id:87po65pyww.fsf@nicolasgoaziou.fr]]

- [X] 567b5efe1f338c10c574758fb968915c5c34c909

  Update Org to v9.1.4
  Rasmus
  Wed Dec 6 15:02:15 2017 +0100

- [X] d20161b25e9cd184d841ba9e36ee5141c01fd75f

  Merge from origin/emacs-26
  Paul Eggert
  Sat Nov 25 22:55:35 2017 -0800

- [X] 8d99e233147d44c2176cef599db754d06b12f5e3

  Merge from origin/emacs-26
  Paul Eggert
  Wed Nov 8 19:22:26 2017 -0800

- [X] c75f505dea6a560b825384cf3d277690f86840bf

  Prefer nil to (current-time) when either works
  Paul Eggert
  Fri Oct 20 19:42:23 2017 -0700

  this touches a lot, but not sure where to backport.  this is in
  Emacs's master and emacs-26 is in rc.

  also, need to revert some that are used in tests (already have
  comment saying so)

  unfortunately, rasmus applied sync to master, so this was reverted
  then.  will come back around once 26.1 is released and I apply this
  to our maint, but someone will likely yell before then

- [X] cdef84fb6893f69ffee1a99fe82a262e02e59bf5

  Spelling fixes
  Paul Eggert
  Sun Sep 10 09:24:37 2017 -0700

- [X] b65cb981cce96eeae3690ffddac6f3ebe314036c

  ; Fix Org sync 3ad8ca429bac
  Rasmus
  Tue Aug 29 16:52:16 2017 +0200

- [X] 3ad8ca429bac5e1354881cf4411d6f41dab36b44

  Update Org to v9.0.10
  Rasmus
  Tue Aug 29 10:13:31 2017 +0200

- [X] 05f9ffd53c65699e8de6cca4817b1f2dc2f63a79

  Improve expand-file-name doc
  Paul Eggert
  Fri Aug 25 21:14:06 2017 -0700

- [X] 65d3c27fe13565bfacd4e5138cd217d6084c6ee9

  Delete library-of-babel.org
  Bastien
  Fri Aug 18 09:39:54 2017 +0200

  covered by 51763701297a165b7534a52d57304c5a84b52df7

- [X] 5bdc97d55df30f6af107ddd136901983a7e2706a

  Be consistent in spelling 'ok-if-already-exists'.
  Paul Eggert
  Sun Aug 13 11:55:12 2017 -0700

- [X] 20e9a00fb5d12ad408f9dd15adcfcd205783c1b0

  Spelling fixes
  Paul Eggert
  Thu Jul 6 00:24:56 2017 -0700

- [X] 0fda6d53e38cc7073186fed0bd862221d21500ab

  ; Standardize some copyright and license notices
  Glenn Morris
  Wed Jul 5 14:08:35 2017 -0400

- [X] 26a308ea112637911fd3870139ba0e2d98e58aa0

  * lisp/org/ox-html.el (org-html-infojs-template): Update copyright.
  Glenn Morris
  Wed Jul 5 14:07:14 2017 -0400

- [X] 20e006ffee41062f1b551a92c24d9edc53cd0f56

  ; Fix version in orgcard.tex
  Rasmus
  Fri Jun 23 10:59:16 2017 +0200

  part of Rasmus/Bastien Org merge

- [X] 896641b962443a6398ebe337cd78a6c1180971c1

  Synchronize with the "emacs-sync" branch from Org
  Rasmus
  Fri Jun 23 10:58:09 2017 +0200

  part of Rasmus/Bastien Org merge

- [X] 5cfdf8dd17366e3ebf9f4e000b82a281c4183e66

  ; Fix ORG-NEWS formatting in previous commit
  Rasmus
  Thu Jun 22 12:26:08 2017 +0200

  part of Rasmus/Bastien Org merge

- [X] 5cecd275820df825c51bf9a27fcc7e35f30ff273

  Update Org to v9.0.9
  Rasmus
  Thu Jun 22 11:54:18 2017 +0200

  part of Rasmus/Bastien Org merge

- [X] de296e0d2e38b572617eb994ebcd2796316941f7

  Revert "Don't bind org-agenda key to an anonymous function"
  Bastien
  Tue Jun 20 07:54:19 2017 +0200

  reverts below commit

- [X] 49c0ff29c2e0243ba35ec17e3e3af49369be43db

  Don't bind org-agenda key to an anonymous function
  Mark Oteiza
  Fri Jun 16 21:51:05 2017 -0400

  reverted by above commit

- [X] b52e40d756af935a4f6dc46842d306b5493a7b73

  ; ChangeLog fixes
  Glenn Morris
  Wed Jun 7 15:55:33 2017 -0400

  skipped

- [X] 6a757bead92a3cb827d9b19a1a5ca931f198c045

  ; ChangeLog fixes
  Glenn Morris
  Mon Jun 5 20:33:55 2017 -0400

  skipped

- [X] 3c4c8ca06e3306ccbcd07e354eb51abe53b52d22

  Fix all unescaped character literals
  Philipp Stephani
  Sun May 7 13:22:34 2017 +0200

- [X] cee4128135d0d9fd6032a0134b649d5fc81370c0

  Merge from origin/emacs-25
  Glenn Morris
  Thu Apr 27 22:03:56 2017 -0700

- [X] c68cce94c46140f2ad1411550427d3cc2658ec02

  ; Fix typo in error messages (Bug#26034)
  Christian Garbs
  Mon Apr 17 07:07:12 2017 +0300

- [X] 8750a4546a1da4f03243df12c7e5b89f2c32d27e

  Fix org-agenda's command for calendar-lunar-phases
  Teemu Likonen
  Sun Apr 16 22:06:48 2017 +0300

  Already fixed.

- [X] 2e4f4c9d48c563ff8bec102b66da0225587786c6

  Don't call 'kill-this-buffer' outside of menus
  Eli Zaretskii
  Wed Apr 12 23:14:20 2017 +0300

  Used 7fb6ab52c (Don't call kill-this-buffer outside of menus,
  2017-04-16) instead.

- [X] c92bae9a08cc7c2eb61bad32d9a9d6553b6d2c19

  change org to use derived-mode-p
  Tom Tromey
  Wed Apr 5 15:53:38 2017 -0600

- [X] 14d8b6858a49e97f9b69593df5a8a7886430d43f

  Port and simplify example sh script
  Paul Eggert
  Tue Mar 21 09:19:42 2017 -0700

- [X] e6fd84d2d5ca256797ff210c915a2fa773d4d742

  Merge from origin/emacs-25
  Paul Eggert
  Sun Mar 19 12:29:06 2017 -0700

- [X] 265a5d9791bf42da0bab7bdbef4352e8d734ef31

  Document remote file name syntax change
  Michael Albinus
  Thu Mar 16 16:23:07 2017 +0100

- [X] 2ec41c415f39990561cc9da4c9bad0b69bfad489

  Avoid add-to-list on local variables
  Stefan Monnier
  Wed Jan 4 00:40:45 2017 -0500

- [X] bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9

  Merge from origin/emacs-25
  Paul Eggert
  Sun Jan 1 01:10:47 2017 -0800

- [X] f15f6b53078ac2176f8d2c05d99d3d9b4d32986b

  Merge from origin/emacs-25
  Paul Eggert
  Wed Dec 7 12:43:16 2016 -0800

- [X] fd6632b397316146397dd478a858f0b9a90efeed

  Merge from origin/emacs-25
  Paul Eggert
  Wed Dec 7 12:39:08 2016 -0800

- [X] 22946702b4296c0e42e4baf6221e205b52d05cbf

  Add file-local-name
  Michael Albinus
  Sun Nov 20 16:29:47 2016 +0100

  Waited until clear that 25.2 would not be targeted.

- [X] 67df076793773c6226b8c08c435109aeb2e7a0d3

  ; Replace "25.2" with "26.1" where appropriate, which is almost everywhere
  Glenn Morris
  Thu Nov 17 22:50:40 2016 -0800

  Ignoring.  not sure how to deal with Org versus Emacs version
  specification in define-obsolete-function-alias, and user-error
  compatibility is now gone in maint (v9).  ONSYNC.

- [X] c325e199668a2449a9b0d662e114eec9d4802288

  Merge from origin/emacs-25
  Paul Eggert
  Mon Aug 22 14:40:35 2016 -0700

  Ignored.  Just changelog.

- [X] 2c0506173d92dd9d6de409a045668c6b5cf1fcef

  Add `make-nearby-temp-file' and `temporary-file-directory'
  Michael Albinus
  Sun Aug 7 13:57:23 2016 +0200

  Originally, one part of this was taken care of in maint (89f10a1),
  the other in master (84e3f23).  Now in release_9.0

- [X] 68cb71c0928eb8b10487a125192f43923e8bfe7f

  Merge from origin/emacs-25
  Paul Eggert
  Sun Jun 19 00:47:00 2016 +0200

  Ignored.

- [X] 48079f68125e75cf581ef2b86b00c5a3851dd6e7

  ; Refer to version 25.2 rather than 26.1. ; I hope the next release from master is indeed 26.1, but for reasons ; that passeth my understanding we currently call it 25.2 everywhere else, ; so we should at least be consistent.
  Glenn Morris
  Fri Jun 10 00:55:02 2016 -0400

  Ignored.  Maybe ONSYNC.

- [X] 65c8c7cb96c14f9c6accd03cc8851b5a3459049e

  Pacify ‘make check-declare’
  Paul Eggert
  Sat May 14 19:57:44 2016 -0700

- [X] e2f785991d0c696fbb2bc2f331f888d979b8da82

  Simplify now that float-time etc. are built-in
  Paul Eggert
  Sun May 8 12:46:22 2016 -0700

  Initially skipped for compatibility reasons.

  Now 0ac099a6f (Remove final parts of XEmacs compatibility code,
  2016-05-26) has taken care of it.

  Main issue to deal with ONSYNC is listing of Org 9.0 in
  define-obsolete-function-alias call rather than Emacs version.

- [X] 65150493f7e3f0768fccd6097c6dafc9ae18770b

  Fix org-timestamp-change typo
  Paul Eggert
  Wed Apr 20 00:06:52 2016 -0700

  e0acd8a (Fix "Invalid time zone specification" error, 2016-04-16) should
  already cover this.

- [X] fdb1ba144ca61185e6457f092f38f59dd9bbe6a0

  Support OFFSET and (OFFSET ABBR) time zone rules
  Paul Eggert
  Tue Apr 12 09:19:38 2016 -0700

  Skipping since I went with acfd411 (Update format-time-string calls for
  argument change, 2016-04-11).

- [X] 1203e8aecb7f49621af52cc13bc0e4427545dd4f (master)

  * lisp/org: Fix some compiler warnings
  Stefan Monnier
  Mon Jan 25 10:11:31 2016 -0500

  This is on master.

** emacs 26 branch [45/45]
:PROPERTIES:
:ref:      origin/emacs-26
:END:

- [X] 7681a57b88a91bf9eedc890b974df9728d5eb50d

  Remove redundants "See" before @xref or @pxref (Bug#35793)
  Mauro Aranda
  Sat May 25 13:02:05 2019 -0400

  doubt this matters with org conversion.  discarding

- [X] b5e66f46a6f33f9d633e6cc3e0770a566bdfcf6b

  Update citations of Internet RFCs
  Paul Eggert
  Sat Feb 16 12:00:02 2019 -0800

- [X] 2fcf2dff00a55ece17f4342a934cb1d69ae1a743

  Fix copyright years by hand
  Paul Eggert
  Tue Jan 1 01:02:40 2019 +0000

- [X] 26bed8ba10eeaf0a340a8d0d760c5578dddec867

  Update copyright year to 2019
  Paul Eggert
  Tue Jan 1 01:01:13 2019 +0000

  This should all be covered by Bastien's update.  Unfortunately that
  means that the ship has sailed for being able to sync the current
  emacs-sync to the emacs-26 without additional work.

- [X] 6a7a869c33bb69efd93bb0ce8d8322083dbbcbac

  Org manual: Rewrite the Org Mobile section
  Nicolas Goaziou
  Sun Sep 30 14:40:14 2018 +0300

- [X] d309994aff03200ed8ef9fadd98f69d6d3166701

  Fix typos in documentation
  Eli Zaretskii
  Thu Sep 27 18:48:06 2018 +0300

- [X] 6d2352594f4e4e17965834851547df3adaa6cd6f

  Fix typos in several manuals (Bug#31610)
  Ville Skyttä
  Fri Jun 1 16:33:58 2018 +0300

- [X] 8f6293ca789edf06ea8e7b4b80edf7558d590ca7

  Fix use of @key in Texinfo manuals
  Eli Zaretskii
  Thu Apr 19 12:21:06 2018 +0300

- [X] 9bff405d09f6eeeb577e6e0111e49f35d3b95b52

  * doc/misc/org.texi (Installation): Fix clone commands.
  Michael Albinus
  Wed Mar 28 10:38:26 2018 +0200

- [X] 613c9a5c1f3237fbdc3a3db2341c7c59353d2aa2

  Update Org to v9.1.9
  Rasmus
  Tue Mar 27 23:34:41 2018 +0200

- [X] 7d6c7d0b461705fd67f7df1096b6f6376931f140

  ; Use GNU not Gnu in docs
  Glenn Morris
  Fri Mar 23 16:01:12 2018 -0400

- [X] a6a821d29bda3e45fb26289e6119359ea3b91ebb

  * lisp/org/ob-lisp.el (org-babel-lisp-eval-fn): Tweak type.
  Glenn Morris
  Thu Mar 22 14:37:45 2018 -0400

- [X] 16faff6a46f28b4db2e9b91e52b27404303f3197

  ; * lisp/org/org-table.el: Replace obsolete alias in comment.
  Glenn Morris
  Fri Mar 9 12:43:21 2018 -0500

- [X] f2caf08ca625f64c7eeea8dfa8f65a5b1bac58e2

  ; Spelling fixes
  Paul Eggert
  Sun Mar 4 17:10:34 2018 -0800

- [X] 9743f48de7325bd95a42e1a27acbf6635f8d086b

  Mark keys consistently in manuals
  Michael Albinus
  Mon Feb 26 13:53:37 2018 +0100

- [X] ce557a924a299650b5e0c93ba276f1ec651f7941

  Remove @key{} markups from @kindex entries in manuals
  Michael Albinus
  Mon Feb 26 09:24:39 2018 +0100

- [X] 7a069f35d4ce002dc10d666fde2850d8e6eee427

  Fix @kindex entries in manuals
  Michael Albinus
  Sun Feb 25 16:29:39 2018 +0100

- [X] e415309fef4077fe7e4dfe1a898d749c1136ca2c

  Fix @cindex entries in org.texi
  Michael Albinus
  Sat Feb 24 20:40:39 2018 +0100

- [X] 69107f347b3ac7f51cd22333f57393fd735915f2

  ; Fix doc typos related to indefinite articles
  Glenn Morris
  Fri Feb 16 17:33:57 2018 -0500

- [X] 66a4e651f3cf38c320d1a9d5ae6f88dcc641792b

  ; Fix doc typos related to indefinite articles
  Glenn Morris
  Fri Feb 16 15:16:15 2018 -0500

- [X] 35e5c57db311c3d6c1c3a8dd4edc3d756d1d5d24

  ; Fix doc typos related to indefinite articles
  Glenn Morris
  Fri Feb 16 14:11:51 2018 -0500

- [X] e1a9dc0af6ffb202ce1393b376d14d3c3897a243

  Recognize Org as builtin package (bug#30310)
  Glenn Morris
  Fri Feb 2 21:09:09 2018 -0500

  Nicolas has applied the header part in
  fffd300efdfa21211c99955b3f9bbc7a1d23e5f8.  I have a to-do for trying
  to sync tests.

- [X] 7d90d2ece041630e0c440a2b0216e43f82729844

  Proofread os.texi and files.texi
  Paul Eggert
  Mon Jan 29 10:38:06 2018 -0800

- [X] bb396a369c93e57b033844003c7ceab61d61aa08

  Update Org to v9.1.6
  Rasmus
  Mon Jan 22 16:02:55 2018 +0100

- [X] 63b04c11d530f4a6a41f112d1b3ba1ed1eb81195

  Fix copyright years by hand
  Paul Eggert
  Mon Jan 1 01:02:09 2018 -0800

  covered by our own

- [X] 5c7dd8a783fa2503f042f6671279e5fca38c35cb

  Update copyright year to 2018
  Paul Eggert
  Mon Jan 1 00:57:59 2018 -0800

  covered by our own

- [X] 445eefd238eb7c3843e18cd265c05f07233f8aff

  Backport: Update Org to v9.1.4
  Rasmus
  Wed Dec 6 15:37:41 2017 +0100

- [X] a89f0b6f33f9eb8910a1fceda9028d76ef50b05d

  maint: shorten https://lists.gnu.org/archive/html/... links
  Paul Eggert
  Sat Nov 25 22:48:12 2017 -0800

- [X] 98288ecaffbc0947ec3193088172ea85ad5e42a5

  Further workaround for faulty localtime() under macOS 10.6
  Charles A. Roelli
  Wed Nov 8 20:51:48 2017 +0100

- [X] 5d51403ceb9b86a1bfa66f00c7af39f1200e65f1

  ; Typo fixes, mostly repeated words
  Paul Eggert
  Mon Oct 9 22:55:06 2017 -0700

- [X] 0d004ed01abb5fa025bdc9d58fce2a3abff0b6a4

  ; Spelling fixes
  Paul Eggert
  Mon Oct 9 22:55:05 2017 -0700

- [X] 2a32ee1fbc148d440fc12aa390ed3d2cc7d6fe3b

  Update Org to v9.1.2
  Rasmus
  Thu Oct 5 21:30:05 2017 +0200

- [X] 5172fa02cccaab2500ecf85aaf65b8deed54d42e

  Prefer HTTPS to HTTP for gnu.org
  Paul Eggert
  Sun Oct 1 19:59:01 2017 -0700

  changelog only

  [2017-10-04 Wed] never mind, has change in org news.

- [X] bd49b6f1b39cffeaf6098bc7b0182552683b1c07

  Workaround for faulty localtime() under macOS 10.6
  Charles A. Roelli
  Sun Oct 1 19:07:22 2017 +0200

- [X] 07ea5ef99a509622981a8ca69aadff15cbc0ef10

  Fix reference style in org.texi
  Martin Rudalics
  Sun Oct 1 10:30:33 2017 +0200

  not sure about. sent question to emacs ml

- [X] cbc832448878f7bc7b226243abb8d8b1ae68a937

  Prefer HTTPS to HTTP for gnu.org
  Paul Eggert
  Fri Sep 29 17:48:22 2017 -0700

  changelog only

- [X] bbda601d1d4e125c9d3c374b56eee3e2e9623f1d

  ; Spelling fixes
  Paul Eggert
  Fri Sep 29 16:41:50 2017 -0700

- [X] 26d58f0c5865c9132e2fc559e061ef704a086d30

  ; Standardize license notices
  Glenn Morris
  Fri Sep 29 12:49:19 2017 -0400

- [X] d4b2bbdc73ace5cb0971a32a75941486489d1cc5

  Merge branch 'emacs-26' into scratch/org-mode-merge
  Rasmus
  Fri Sep 29 10:41:51 2017 +0200

- [X] eaefbc26d5c6cffbe4a22d3a9f4c7e6209a7b5a7

  ; Add files missing in ab351d442d7
  Rasmus
  Tue Sep 19 09:00:00 2017 +0200

- [X] ab351d442d7bb4d17cbb43638aaed1775d8c0344

  Update Org to v9.1.1
  Rasmus
  Mon Sep 18 12:01:12 2017 +0200

- [X] f2b2201594b59ff758347644a84cdc8f6b046ec9

  ; Spelling and URL fixes
  Paul Eggert
  Sat Sep 23 00:36:56 2017 -0700

  changelog only

- [X] bc511a64f6da9ab51acc7c8865e80c4a4cb655c2

  Prefer HTTPS to FTP and HTTP in documentation
  Paul Eggert
  Wed Sep 13 15:54:37 2017 -0700

- [X] 5da53a01912c2f5d46f5df4ef8cc13a34b5017d4

  Prefer HTTPS to HTTP for gnu.org
  Paul Eggert
  Wed Sep 13 15:54:25 2017 -0700

- [X] 74b8615fcceba7b92c4938e1bcc92015f10ae899

  Adjust ob-tangle to new copy-file behavior
  Paul Eggert
  Sun Sep 10 22:31:23 2017 -0700

** emacs-25 branch [40/40]
:PROPERTIES:
:ref:      origin/emacs-25
:END:

- [X] d38fd9229c07c531ebc0bec0ea65f7d7dffcd983

  Narrow scope of modification hook renabling in org-src fontification
  Noam Postavsky
  Tue Mar 21 09:19:57 2017 -0400

  Already taken care of by Org's 0ccd8286a (org-src: Fix fontification
  error, 2017-03-19).

- [X] ae8264c5cccf19d5b25a340a605bf2f07de1577e

  Call modification hooks in org-src fontify buffers
  Noam Postavsky
  Sun Jan 29 11:01:32 2017 -0500

  Already taken care of by 0ccd8286a (org-src: Fix fontification
  error, 2017-03-19).

- [X] 2e2a8068031b79a6cc5502b8d4c9d849ebb1dae0

  Fix copyright years by hand
  Paul Eggert
  Sun Jan 1 04:01:41 2017 +0000

- [X] 5badc81c1cdfbb261ad3e6d1b753defb15712f26

  Update copyright year to 2017
  Paul Eggert
  Sat Dec 31 19:42:26 2016 -0800

- [X] eeecac7ab9d1f8c3a29cffe4586e5fd2414dd671

  Fix minor quoting problems in doc strings
  Paul Eggert
  Wed Dec 7 11:31:16 2016 -0800

- [X] 6d27423d381c3496e76e8d57e0d81841cdde0815

  Tweak refcard note about documentation location
  Glenn Morris
  Sun Nov 27 16:38:56 2016 -0800

  Maybe ONSYNC.

- [X] 4af5981dc75c96e34a27922001106df05ee19e69

  Add a comment in generated refcards about the source
  Glenn Morris
  Thu Nov 17 23:24:03 2016 -0800

  I'm skipping this because it isn't true when the card is from the Org mode
  repo.  Maybe ONSYNC.

- [X] 5b0cddd91535025bbf0c69d17e2d4e470dd350c5

  More fixes in copyright notices in etc/refcards/
  Eli Zaretskii
  Tue Nov 15 19:01:07 2016 +0200

- [X] f994c2046588b168c1a4a900879cdffaf9d02f01

  Update copyright text in refcards
  Eli Zaretskii
  Sun Nov 13 18:20:59 2016 +0200

- [X] dc152c54f4e44f5f2040883b03f71ff6aa66c893

  Modernize usage of 'macOS' in doc and comments
  Paul Eggert
  Sun Nov 6 00:42:03 2016 -0700

- [X] 73cbb813cfea53e4162409f2adc0a793ab301894

  ; ChangeLog spelling fixes
  Paul Eggert
  Sun Aug 21 04:15:44 2016 -0700

  Ignored.  Just changelog.

- [X] 27fe1e459ab137b20d45ef4167f3c2ec0d10fdd4

  org.el: Fix bindings of < and > for calendar scrolling
  Marco Wahl
  Wed Jun 8 16:04:12 2016 -0700

  Already present.

- [X] b52ebd4f20ecc3f207a88cf7ac18c745b6e8ef80

  org-map-entries: Fix org-agenda-prepare-buffers call
  Phillip Lord
  Sat Apr 30 14:46:44 2016 +0100

  This a backport from my commit in Org repo.

- [X] ca509810014726cf6bee9f7e8f69bdeaf62dc146

  Improve time zone documentation
  Paul Eggert
  Tue Apr 12 08:49:19 2016 -0700

  Skip because did not go with b787d55.  Instead restricted to utc.

- [X] b787d5501bad8036016d835faa2f90bb0904c038

  More format-time-string change fixups
  Paul Eggert
  Sat Apr 2 23:44:18 2016 -0700

- [X] 3b734e1273220596485f2dcbdb3be916eba53047

  * org/org-compat.el (org-font-lock-ensure): Fix bogus test (bug#22399)
  Kyle Meyer
  Mon Feb 1 08:48:35 2016 -0500

  Already included in a4edee4 (org-compat: Update font-lock-ensure alias,
  2016-01-29).

- [X] a528a60f48f6b939c5014c96d3445de13d2ed243

  Spelling fixes
  Paul Eggert
  Mon Jan 25 08:09:09 2016 -0800

  Just ChangeLog.

- [X] ec90220ac1bd81437654d07b769819e1dcd24de5

  Expunge "allow" + infinitive from source and doc, part 2.
  Alan Mackenzie
  Mon Jan 25 12:35:15 2016 +0000

- [X] fbce4757a874cc43806eb41b8637538b101c3c69

  Expunge "allow" + infinitive without direct object from source and doc.
  Alan Mackenzie
  Sun Jan 24 20:30:39 2016 +0000

- [X] 9c3dbabee3cc8cddce33aaa7622dfb4c11353123

  Fix copyright years by hand
  Paul Eggert
  Fri Jan 1 01:38:07 2016 -0800

  I merged this and the last one.

- [X] 0e963201d03d9229bb8ac4323291d2b0119526ed

  Update copyright year to 2016
  Paul Eggert
  Fri Jan 1 01:34:24 2016 -0800

- [X] ac16149ba470ae8a625d42a61adbb6e84254c675

  Fix docstring quoting problems with ‘ '’
  Paul Eggert
  Tue Nov 17 15:29:35 2015 -0800

- [X] ab11a1cf27ebe3791df45cccde3c851affd184dd

  Use %s to format strings instead of splicing them
  Paul Eggert
  Sun Sep 20 09:42:05 2015 -0700

- [X] 284c470ef752967fcd8bae6a450dc138462b1e49

  Backslash cleanup in Elisp source files
  Paul Eggert
  Thu Sep 17 16:09:39 2015 -0700

- [X] 753fbfbef484272bcde5214f75fb0846ee3f33df

  Fix several backslash typos in Elisp strings
  Paul Eggert
  Thu Sep 17 12:39:54 2015 -0700

- [X] 6afef3f6ca2f3009c722b84e249903b7f807b044

  Go back to grave quoting in source-code docstrings etc.
  Paul Eggert
  Mon Sep 7 16:09:27 2015 -0700

- [X] 26bd978d87dfbf9baa115cd961a67d42b416c4bf

  Fix some more docstring etc. quoting problems
  Paul Eggert
  Thu Sep 3 15:32:54 2015 -0700

- [X] 19532d147b431a4fe34f088d6de07891c48e2c5c

  Escape ` and ' in doc
  Paul Eggert
  Tue Sep 1 18:23:21 2015 -0700

- [X] 6cd2629bd1b3ce77d29ac28e29237c94a4197116

  Quoting fixes in lisp/org
  Paul Eggert
  Mon Aug 31 00:29:40 2015 -0700

- [X] 875a5d0ead827d3da32ecbd30e739a29f07bbc87

  Prefer directed to neutral quotes
  Paul Eggert
  Mon Aug 24 23:57:25 2015 -0700

- [X] fbb5531fa11d13854b274d28ccd329c9b6652cfc

  More-conservative ‘format’ quote restyling
  Paul Eggert
  Sun Aug 23 22:39:06 2015 -0700

- [X] c1cacb09948928287bfc32745f2a92604d3291c4

  Avoid hard-coding "M-x command" in docstrings
  Paul Eggert
  Fri Aug 21 14:09:47 2015 -0700

- [X] 5091586f5704280e04dc3d12354965d24693f0d5

  Remove no-op calls to substitute-command-keys
  Paul Eggert
  Sun Aug 9 07:48:23 2015 -0700

  None of these changes apply.

- [X] 3a5f75193ed10ee5fb458e9879340947f31d5e12

  * org.el: Fix up some lexical scoping warnings, and use dolist
  Stefan Monnier
  Sat Aug 8 19:41:57 2015 -0400

- [X] 0c856a2c459016f1f9cce173f5b2b49be36e3452

  Fix some confusion with ‘format’
  Paul Eggert
  Wed Aug 5 19:07:28 2015 -0700

- [X] eb0f65b4fbbea60100b53cb40a1d7138d47ad0d2

  Don't overflow if computing approximate percentage
  Paul Eggert
  Fri Jul 31 10:13:38 2015 -0700

- [X] 85aa6ede9fe1b8165a99a4046dd8262ec93a02d5

  Use \r rather than ^M in string literals
  Paul Eggert
  Sat May 30 09:44:38 2015 -0700

- [X] dfc2ef11a84d33eab916ff87b8537f8e28c05c92

  Fix minor quoting problems in doc strings
  Paul Eggert
  Thu May 28 00:22:03 2015 -0700

- [X] 96794d2f97cd064e4c2bf4f71459b42558cc8c79

  Don't quote nil and t in doc strings
  Paul Eggert
  Thu May 21 10:06:44 2015 -0700

- [X] 9d35bb8d6518bb913ab08bace2af08963c003177

  Fix minor quoting problems in doc strings
  Paul Eggert
  Tue May 19 15:01:16 2015 -0700

* Standing changes

** lisp/org

The are changes between the last Org 8.2.10 sync
(212ecd45e38c6035ca1a9b0e9095b2a131567f15) and Bastien's latest
backport (9d4eaff316fffc00fecb2dc1b655bc0df6953144).

The initial list was generated using

#+begin_src sh :dir ~/src/emacs/emacs :results silent
  git log --oneline \
      --format="- %H%n%n  %s%n  %an%n  %cd%n" \
      212ecd45e..9d4eaff31 -- lisp/org \
      > /tmp/emacs-git-log
#+end_src

*** Not yet backported [13/13]

- [X] 7e09ef09a479731d01b1ca46e94ddadd73ac98e3

  Update copyright year to 2015
  Paul Eggert
  Thu Jan 1 14:26:41 2015 -0800

- [X] 732fd4c7e11debd61c97eaaba3038d61e6ec7024

  Update copyright year to 2015
  Paul Eggert
  Thu Jan 1 09:18:06 2015 -0800

  Backported above.  Seem to cover same changes.

- [X] c9a75a4030a556d700fd95222ec0bf4c1a9f67b5

  Fix byte-compiler warnings about looking-back.
  Stefan Monnier
  Mon Apr 20 21:55:00 2015 -0400

- [X] b884ff380dc341ca8dc8fcfe4357110e191216ce

  Spelling fix for 'hfy-optimizations'
  Paul Eggert
  Sun Apr 5 23:43:22 2015 -0700

  maybe

- [X] f9acac751d4cd22480e62cc63936b1208ca9fe48

  system-name's returned value can vary
  Paul Eggert
  Mon Dec 29 12:38:58 2014 -0800

- [X] 7aa506eed8881788485a9774165454404bac2623

  Spelling fixes
  Paul Eggert
  Thu Dec 25 18:08:47 2014 -0800

- [X] 3de474e4ac7418d06b9f37489f939a16d9bde1c2

  Spelling fixes
  Paul Eggert
  Sat Dec 13 23:41:33 2014 -0800

  Maybe should discuss.

  [2015-07-21 Tue] Think it is ok because it is just an alias.

- [X] cc857dd0db0fad257747134bdbd8318a21d12cab

  Fix misspellings like "an unibyte buffer"
  Paul Eggert
  Tue Dec 9 16:27:23 2014 -0800

- [X] 78d45b66d41859ab9bdd571fea18fc06a7670911

  Port current-time change to XEmacs 21.4.
  Paul Eggert
  Tue Oct 28 20:21:06 2014 -0700

  This follows next from (123ddec7f807f4bd7400bbbe08219afb02269c00).
  Think I could put together.

- [X] 123ddec7f807f4bd7400bbbe08219afb02269c00

  Simplify use of current-time and friends.
  Paul Eggert
  Tue Oct 28 18:42:51 2014 -0700

  May need to discuss.

  This also touches docs/misc/org.texi.  Need to check other Org files
  then.  Have backported others.

- [X] 79a90058ec11dbb56665e85a6631e4b8b5e7a6c6

  Merge from emacs-24; up to 2014-07-16T17:06:12Z!rgm@gnu.org
  Glenn Morris
  Fri Oct 3 08:44:46 2014 -0700

  Merge conflict in org-mouse.el.  Only partially fixed.

  Think this should be taken care of with
  9c3883b47dabec27d9fde206f3f951387fe946fd resolution. Check.

- [X] 9c3883b47dabec27d9fde206f3f951387fe946fd

  [...] Prefer point-marker to copy-marker of point [...]
  Dmitry Antipov
  Sun Jun 22 09:43:58 2014 +0400

  With conflicts.  Check differences.

- [X] 6711a21f1125c0047c56eb266eb374c1ec90a967

  [...] Use font-lock-ensure.
  Stefan Monnier
  Wed May 28 23:45:29 2014 -0400

  Partially taken care of by new alias, but there are still places
  that use font-lock-fontify-buffer.  Also, changes unrelated to
  font-lock in ox-org.el.

  With conflicts.  Check differences.

  [2015-07-21 Tue] All differences seem there.  Should see about
  replacing other font-lock-fontify-buffer instances.

*** Already in Org master

- 9d4eaff316fffc00fecb2dc1b655bc0df6953144

  * lisp/org/org-{macs,list}.el: Fix lexical warnings
  Stefan Monnier
  Mon May 4 11:32:39 2015 -0400

- 25166a91fdec1ef9721fe7440b9f8af809134e7d

  Update source file encoding list
  Paul Eggert
  Tue Apr 28 10:52:06 2015 -0700

  In Org's 8cc7b72160b2214311526aa072175d580e648aff.

- caea9a238590f2d165c74a5941c50946677b87ae

  * lisp/org/org-clock.el (org-x11idle-exists-p): Be honest about which
  Stefan Monnier
  Wed Apr 15 22:04:40 2015 -0400

  In Org 9ee9d69a34e98f69e006fa4e68b02ed6f43f3dbf

- cc541e588a000c9aa6f4d732e95b67e2f01433d6

  Spelling fixes.
  Paul Eggert
  Sun Oct 12 13:09:15 2014 -0700

  Already fixed in master.

- 5d2638bd31586fc276ddd4444a49627e855cf7fa

  [...] Use the transient-mark-mode function.
  Stefan Monnier
  Mon Jun 23 11:32:24 2014 -0400

  Not backported, but this was replaced with
  56bbacfd89bcdd773a20b102f956edc2aa5ff9d9 in Org repo.

- 33848c48a5e8823f44994624443fabdf615292dc

  "the the", "from from" and "and and".
  Mario Lang
  Mon Jun 23 01:12:17 2014 +0200

  Fixed in Org be9a1638afabae716131393a7c0b25a06fc5a9bd.

*** Merge or ChangeLog related

- [ ] 37ad855a38786722833d06dfe78786acc7e9f412

  Merge from origin/emacs-24
  Paul Eggert
  Tue Mar 3 14:41:30 2015 -0800

- [ ] 14b4e657e2fd647153b336c61a220acedda8454c

  Spelling fixes
  Paul Eggert
  Sat Feb 21 20:01:05 2015 -0800

  What to do with ChangeLog spelling changes these since presumably
  autogenerated?

- [ ] b0adfc721f505b5d6e581b18739d8aa1c619d1eb

  Spelling fixes
  Paul Eggert
  Sat Feb 21 12:34:46 2015 -0800

- [ ] 11ee7d8bf16b8ee4fcb3659e4b09686ed8b10590

  ChangeLog fixes
  Glenn Morris
  Fri Jan 2 11:52:03 2015 -0800

- [ ] 35e1f9d9fcbaab51808e05f514e63927f959ae51

  Merge from origin/emacs-24
  Fabián Ezequiel Gallina
  Sat Dec 27 13:31:20 2014 -0300

- [ ] 0cce3623b169732a51f055a86fc926313b11a5ee

  Merge branch 'emacs-24'.
  Paul Eggert
  Fri Nov 28 23:07:16 2014 -0800

- [ ] f24c8f98ec50a3725ccf793dbd09752fec79a3a1

  Fix white-space problems in ChangeLogs.
  Paul Eggert
  Mon Nov 24 17:16:27 2014 -0800

- [ ] d361bcfbc7a69737ccd383e127fc8744c80cf5b4

  * lisp/select.el: Use lexical-binding.[...]
  Stefan Monnier
  Wed Oct 22 21:38:59 2014 -0400

- [ ] eed18bf1fd1162872e196091ab795a773f277e8e

  Merge from emacs-24
  Stefan Monnier
  Mon Oct 20 21:17:06 2014 -0400

- [ ] 8a85c254de2528be0f3ff154fa24df65e6557c1a

  Merge from emacs-24; up to 2014-07-28T06:28:15Z!dmantipov@yandex.ru
  Glenn Morris
  Mon Oct 20 20:59:41 2014 +0100

- [ ] 83bad90efe943e7c88431b7a71bc1d5cf1304c92

  Add 24.4 release ChangeLog entries
  Glenn Morris
  Mon Oct 20 20:21:15 2014 +0100

- [ ] 2cae8632b75245e232030244159963287ffc6231

  Merge from emacs-24; up to 2014-07-27T01:00:26Z!fgallina@gnu.org
  Glenn Morris
  Mon Oct 13 16:55:41 2014 -0400

- [ ] 2bcc04b3fc8656afef453371f2fa7a40e6d47677

  ChangeLog fix
  Glenn Morris
  Mon Oct 13 15:17:46 2014 -0400

- [ ] b1d5ab0352b6132eee4feaf9091ce7dc7a3e6a84

  Merge from emacs-24; up to 2014-07-26T11:58:24Z!schwab@linux-m68k.org
  Glenn Morris
  Sun Oct 12 15:56:45 2014 -0700

- [ ] 259a0b6d3bc6ffe0d5d24368e415fa46f439a844

  Merge from emacs-24; up to 2014-07-17T10:18:19Z!dmantipov@yandex.ru
  Glenn Morris
  Fri Oct 3 09:07:31 2014 -0700

- [ ] bbbabffe06d4c763534d5be92844c48a3f8746e2

  Merge from emacs-24; up to 2014-05-12T06:15:47Z!rgm@gnu.org
  Glenn Morris
  Sun May 11 23:59:30 2014 -0700

- [ ] 42e910349d699ee3f8024371ca1e60e015fc6aa7

  Merge from emacs-24; up to 2014-04-22T20:19:17Z!eggert@cs.ucla.edu
  Paul Eggert
  Tue Apr 22 14:32:51 2014 -0700

** org.texi

#+begin_src sh :dir ~/src/emacs/emacs :results silent
  git log --oneline \
      --format="- %H%n%n  %s%n  %an%n  %cd%n" \
      212ecd45e..9d4eaff31 -- doc/misc/org.texi \
      > /tmp/emacs-git-log
#+end_src

*** Not yet backported [8/8]

- [X] 08782a2ea95dec5662954a1de353a7da699ac339

  Prefer plain characters to Texinfo circumlocutions
  Paul Eggert
  Fri May 1 12:58:53 2015 -0700

- [X] c33d89cc644f995510b13b951e4201879de2b6f8

  Fix single-quoting style in PDF manuals
  Paul Eggert
  Fri May 1 12:06:38 2015 -0700

  Need to add docstyle.texi

- [X] 279558f472246dd19864f4175cb1d6061bc1ed92

  Minor quoting etc. fixes to misc manuals
  Paul Eggert
  Sat Apr 11 07:48:21 2015 -0700

- [X] 41278b775bd3ebc213ff8b9eda2f2c04a5354bba

  Spacing and punctuation fixes
  Paul Eggert
  Tue Mar 17 16:56:21 2015 -0700

- [X] 52a4e87c630ea397408efe4f8486be55e1199905

  Fix copyright years by hand
  Paul Eggert
  Thu Jan 1 14:27:34 2015 -0800

- [X] 02073b2e84022ff9c9b76d58061e9aa810056229

  Fix some 24-hour time stamps in documentation.
  Paul Eggert
  Thu Nov 13 19:16:15 2014 -0800

- [X] 29993416fb4d19c1c3bb146367fc4bed74845486

  Add .info extension to @setfilename commands in doc/ This makes no difference to anything, since we always use makeinfo -o, but it makes automake happier, if we ever decide to use that.
  Glenn Morris
  Mon Jun 9 22:20:31 2014 -0400

*** Already in Org master

- 25166a91fdec1ef9721fe7440b9f8af809134e7d

  Update source file encoding list
  Paul Eggert
  Tue Apr 28 10:52:06 2015 -0700

- 33848c48a5e8823f44994624443fabdf615292dc

  "the the", "from from" and "and and".
  Mario Lang
  Mon Jun 23 01:12:17 2014 +0200

*** Merge or ChangeLog related

- b1d5ab0352b6132eee4feaf9091ce7dc7a3e6a84

  Merge from emacs-24; up to 2014-07-26T11:58:24Z!schwab@linux-m68k.org
  Glenn Morris
  Sun Oct 12 15:56:45 2014 -0700

- 79a90058ec11dbb56665e85a6631e4b8b5e7a6c6

  Merge from emacs-24; up to 2014-07-16T17:06:12Z!rgm@gnu.org
  Glenn Morris
  Fri Oct 3 08:44:46 2014 -0700

- 015936fba1bcaa51b7886a73144d4c088200c0aa

  Merge from emacs-24; up to 2014-05-26T10:21:18Z!rgm@gnu.org
  Glenn Morris
  Sun May 25 19:28:09 2014 -0700

- fb3f83f5fd9e80347c8b8e36f6eaefbb912fe57b

  Merge from emacs-24; up to 2014-05-08T03:34:20Z!rgm@gnu.org
  Glenn Morris
  Wed May 7 20:41:21 2014 -0700

- 42e910349d699ee3f8024371ca1e60e015fc6aa7

  Merge from emacs-24; up to 2014-04-22T20:19:17Z!eggert@cs.ucla.edu
  Paul Eggert
  Tue Apr 22 14:32:51 2014 -0700

** orgcard.tex

#+begin_src sh :dir ~/src/emacs/emacs :results silent
  git log --oneline \
      --format="- %H%n%n  %s%n  %an%n  %cd%n" \
      212ecd45e..9d4eaff31 -- etc/refcards/orgcard.tex \
      > /tmp/emacs-git-log
#+end_src

*** Not yet backported [1/1]

- [X] 7e09ef09a479731d01b1ca46e94ddadd73ac98e3

  Update copyright year to 2015
  Paul Eggert
  Thu Jan 1 14:26:41 2015 -0800

* Add ORG-NEWS backports [9/9]

[2017-06-22 Thu] I haven't been considering these.  Starting with last
merge to touch ORG-NEWS.

#+begin_src sh :results silent :dir ~/src/emacs/emacs
  echo origin/master >/tmp/emacs-git-log
  git log --oneline \
      --format="- [ ] %H%n%n  %s%n  %an%n  %cd%n" \
      271672fad74cdbc9065d23d6e6cee1b8540f571b^..origin/master \
      -- etc/ORG-NEWS >>/tmp/emacs-git-log
#+end_src

- [X] 5badc81c1cdfbb261ad3e6d1b753defb15712f26

  Update copyright year to 2017
  Paul Eggert
  Sat Dec 31 19:42:26 2016 -0800

  already covered

- [X] dc152c54f4e44f5f2040883b03f71ff6aa66c893

  Modernize usage of 'macOS' in doc and comments
  Paul Eggert
  Sun Nov 6 00:42:03 2016 -0700

- [X] 0e963201d03d9229bb8ac4323291d2b0119526ed

  Update copyright year to 2016
  Paul Eggert
  Fri Jan 1 01:34:24 2016 -0800

  already covered

- [X] 7e09ef09a479731d01b1ca46e94ddadd73ac98e3n

  Update copyright year to 2015
  Paul Eggert
  Thu Jan 1 14:26:41 2015 -0800

  already covered

- [X] 62803a2ef134e37f1ba2c404dda15bf5e2a2a036

  Specify coding if Latin-1 Emacs would misinterpret.
  Paul Eggert
  Sat May 24 15:23:47 2014 -0700

- [X] 06827ec8428b897a38dc0532ee3d2070ae07aba1

  Spelling fixes.
  Paul Eggert
  Thu Jan 9 23:10:37 2014 -0800

  already covered

- [X] ba3189039adc8ec5eba5ed3e21d42019a4616b7c

  Update copyright year to 2014 by running admin/update-copyright.
  Paul Eggert
  Wed Jan 1 07:43:34 2014 +0000

  already covered

- [X] d1389828747d3e78ed968ea4a3341e61e8df4a1d

  Spelling fixes.
  Paul Eggert
  Sat Nov 16 23:51:24 2013 -0800

  already included (or at least covered)

- [X] 271672fad74cdbc9065d23d6e6cee1b8540f571b

  Merge Org version 8.2.3a.
  Bastien Guerry
  Tue Nov 12 14:06:26 2013 +0100

  starting point.