From 6458bbcaace90cce5d385f4830e74aed246927bb Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
Date: Sat, 16 Nov 2019 21:34:55 -0500
Subject: Move orgmode-backports.org from ~/notes

c57360615ef97ff13fc453d82dc79ceeafc61bb5
---
 orgmode-backports.org | 2305 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 2305 insertions(+)
 create mode 100644 orgmode-backports.org

diff --git a/orgmode-backports.org b/orgmode-backports.org
new file mode 100644
index 0000000..2e5d8dd
--- /dev/null
+++ b/orgmode-backports.org
@@ -0,0 +1,2305 @@
+
+* Rules
+
+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
+
+* Commands
+
+** Format patch
+
+: git format-patch -oorg-patches <commit>^..<commit> -- lisp/org
+
+** Apply in Org repo with
+
+: git apply -p3 --directory=lisp/ <patch>
+
+~git am~ can be used with the same arguments.
+
+** Format for commit information
+
+: git show -s --format="%H%n%s%n%an%n%cd" <commit>
+
+** Applying failed patch
+
+When 'git am' fails, the patch can be partially applied with
+
+: git apply --directory=lisp/ --reject -p3 .git/rebase-apply/0001
+
+and then after resolving run
+
+: git am --continue
+
+* Backport list
+
+#+begin_src elisp :results silent
+  (require 'ob-shell)
+
+  (defun org-maint-rev-from-next-item ()
+    (or (and (re-search-forward "- \\[[ X]\\] \\([A-z0-9]\\{40\\}\\)")
+             (match-string-no-properties 1))
+        (user-error "Next revision item not found")))
+#+end_src
+
+NOTE: Look for "ONSYNC" for changes that should be considered when
+syncing, but that don't seem appropriate for Org backport.
+
+** emacs-25 branch [40/40]
+
+#+headers: :var rev=(org-maint-rev-from-next-item)
+#+begin_src sh :results silent :dir ~/src/emacs/emacs
+  echo $rev..origin/emacs-25 >/tmp/emacs-git-log
+  git log --oneline \
+      --format="- [ ] %H%n%n  %s%n  %an%n  %cd%n" \
+      $rev..origin/emacs-25 \
+      -- lisp/org doc/misc/org.texi etc/refcards/orgcard.tex etc/ORG-NEWS \
+      etc/org etc/schema/od-manifest-schema-v1.2-os.rnc etc/schema/od-schema-v1.2-os.rnc \
+      >>/tmp/emacs-git-log
+#+end_src
+
+- [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
+
+- [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
+
+** emacs 26 branch [43/44]
+
+#+headers: :var rev=(org-maint-rev-from-next-item)
+#+begin_src sh :results silent
+  echo $rev..origin/emacs-26 >/tmp/emacs-git-log
+  git -C ~/src/emacs/emacs \
+      log --oneline \
+      --format="- [ ] %H%n%n  %s%n  %an%n  %cd%n" \
+      ^$rev origin/emacs-26 \
+      -- lisp/org doc/misc/org.texi etc/refcards/orgcard.tex etc/ORG-NEWS \
+      etc/org etc/schema/od-manifest-schema-v1.2-os.rnc etc/schema/od-schema-v1.2-os.rnc \
+      >>/tmp/emacs-git-log
+#+end_src
+
+- [ ] 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
+
+- [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
+
+- [ ] e1a9dc0af6ffb202ce1393b376d14d3c3897a243
+
+  Recognize Org as builtin package (bug#30310)
+  Glenn Morris
+  Fri Feb 2 21:09:09 2018 -0500
+
+  Guess Nicolas paritally backported in
+  fffd300efdfa21211c99955b3f9bbc7a1d23e5f8.
+
+- [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
+
+** master branch [170/171]
+
+#+headers: :var rev=(org-maint-rev-from-next-item)
+#+begin_src sh :results silent :dir ~/src/emacs/emacs
+  echo $rev..origin/master >/tmp/emacs-git-log
+  git -C ~/src/emacs/emacs \
+      log --oneline \
+      --format="- [ ] %H%n%n  %s%n  %an%n  %cd%n" \
+      $rev..origin/master \
+      -- lisp/org doc/misc/org.texi etc/refcards/orgcard.tex etc/ORG-NEWS \
+      etc/org etc/schema/od-manifest-schema-v1.2-os.rnc etc/schema/od-schema-v1.2-os.rnc \
+      >>/tmp/emacs-git-log
+#+end_src
+
+- [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 unecessary.
+
+- [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 happended here, but ignoring since it was at last 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
+
+- [ ] 7681a57b88a91bf9eedc890b974df9728d5eb50d
+
+  Remove redundants "See" before @xref or @pxref (Bug#35793)
+  Mauro Aranda
+  Sat May 25 13:02:05 2019 -0400
+
+  same note as above
+
+- [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] b5e66f46a6f33f9d633e6cc3e0770a566bdfcf6b
+
+  Update citations of Internet RFCs
+  Paul Eggert
+  Sat Feb 16 12:00:02 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] 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
+
+- [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] 6a7a869c33bb69efd93bb0ce8d8322083dbbcbac
+
+  Org manual: Rewrite the Org Mobile section
+  Nicolas Goaziou
+  Sun Sep 30 14:40:14 2018 +0300
+
+- [X] 6aa93b45af9fb3631fb8fb6a04407db4d9a74107
+
+  Merge from origin/emacs-26
+  Glenn Morris
+  Fri Sep 28 07:54:24 2018 -0700
+
+- [X] d309994aff03200ed8ef9fadd98f69d6d3166701
+
+  Fix typos in documentation
+  Eli Zaretskii
+  Thu Sep 27 18:48:06 2018 +0300
+
+- [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] 6d2352594f4e4e17965834851547df3adaa6cd6f
+
+  Fix typos in several manuals (Bug#31610)
+  Ville Skyttä
+  Fri Jun 1 16:33:58 2018 +0300
+
+- [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] 8f6293ca789edf06ea8e7b4b80edf7558d590ca7
+
+  Fix use of @key in Texinfo manuals
+  Eli Zaretskii
+  Thu Apr 19 12:21:06 2018 +0300
+
+- [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] 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] 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] a6a821d29bda3e45fb26289e6119359ea3b91ebb
+
+  * lisp/org/ob-lisp.el (org-babel-lisp-eval-fn): Tweak type.
+  Glenn Morris
+  Thu Mar 22 14:37:45 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] 16faff6a46f28b4db2e9b91e52b27404303f3197
+
+  ; * lisp/org/org-table.el: Replace obsolete alias in comment.
+  Glenn Morris
+  Fri Mar 9 12:43:21 2018 -0500
+
+- [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] f2caf08ca625f64c7eeea8dfa8f65a5b1bac58e2
+
+  ; Spelling fixes
+  Paul Eggert
+  Sun Mar 4 17:10:34 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] 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] 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] 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] a0c7157a16481b0523ad20cda9115f9435188f73
+
+  Merge from origin/emacs-26
+  Glenn Morris
+  Mon Feb 5 07:50:22 2018 -0800
+
+- [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.  I have a to-do for trying to
+  sync tests.
+
+- [X] 084cfae0e624469ebca78b155ffe4e2c20f2b205
+
+  Merge from origin/emacs-26
+  Glenn Morris
+  Tue Jan 30 07:50:25 2018 -0800
+
+- [X] 7d90d2ece041630e0c440a2b0216e43f82729844
+
+  Proofread os.texi and files.texi
+  Paul Eggert
+  Mon Jan 29 10:38:06 2018 -0800
+
+- [X] 35675bb93f4620c43ca766e8a2d8708fd323c684
+
+  Merge from origin/emacs-26
+  Paul Eggert
+  Mon Jan 22 08:43:54 2018 -0800
+
+- [X] bb396a369c93e57b033844003c7ceab61d61aa08
+
+  Update Org to v9.1.6
+  Rasmus
+  Mon Jan 22 16:02:55 2018 +0100
+
+- [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] 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] 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] a89f0b6f33f9eb8910a1fceda9028d76ef50b05d
+
+  maint: shorten https://lists.gnu.org/archive/html/... links
+  Paul Eggert
+  Sat Nov 25 22:48:12 2017 -0800
+
+- [X] 8d99e233147d44c2176cef599db754d06b12f5e3
+
+  Merge from origin/emacs-26
+  Paul Eggert
+  Wed Nov 8 19:22:26 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] 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] 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
+
+- [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
+
+- [X] cbc832448878f7bc7b226243abb8d8b1ae68a937
+
+  Prefer HTTPS to HTTP for gnu.org
+  Paul Eggert
+  Fri Sep 29 17:48:22 2017 -0700
+
+  changelog only
+
+- [X] bbda601d1d4e125c9d3c374b56eee3e2e9623f1ds
+
+  ; 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
+
+- [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] d38fd9229c07c531ebc0bec0ea65f7d7dffcd983
+
+  Narrow scope of modification hook renabling in org-src fontification
+  Noam Postavsky
+  Tue Mar 21 09:19:57 2017 -0400
+
+  Already covered.
+
+- [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] ae8264c5cccf19d5b25a340a605bf2f07de1577e
+
+  Call modification hooks in org-src fontify buffers
+  Noam Postavsky
+
+  Already taken care of by 0ccd8286a (org-src: Fix fontification
+  error, 2017-03-19).
+
+- [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] 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] 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] 73cbb813cfea53e4162409f2adc0a793ab301894
+
+  ; ChangeLog spelling fixes
+  Paul Eggert
+  Sun Aug 21 04:15:44 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] 27fe1e459ab137b20d45ef4167f3c2ec0d10fdd4
+
+  org.el: Fix bindings of < and > for calendar scrolling
+  Marco Wahl
+  Wed Jun 8 16:04:12 2016 -0700
+
+  Already applied.
+
+- [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.
+
+* 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] 123ddec7f807f4bd7400bbbe08219afb02269c00
+
+  Simplify use of current-time and friends.
+  Paul Eggert
+  Tue Oct 28 18:42:51 2014 -0700
+
+- [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.
-- 
cgit v1.2.3