Kyle Meyer
6e9a79fbf9
Update hard-coded versions for sync with Emacs
2022-08-21 17:24:27 -04:00
Kyle Meyer
d25f39e01e
Merge branch 'bugfix' into emacs-sync
2022-08-21 17:23:40 -04:00
Kyle Meyer
3e2d5eb268
Update hard-coded versions for sync with Emacs
2022-07-24 16:24:03 -04:00
Kyle Meyer
80a23fdd1f
Merge branch 'bugfix' into emacs-sync
2022-07-24 16:23:55 -04:00
Kyle Meyer
912ea54b64
Update hard-coded versions for sync with Emacs
2022-06-26 22:58:57 -04:00
Kyle Meyer
d9c837eaca
Merge branch 'bugfix' into emacs-sync
2022-06-26 22:58:38 -04:00
Kyle Meyer
1466950c70
Update hard-coded versions for sync with Emacs
2022-06-04 16:19:53 -04:00
Kyle Meyer
45a8661d80
Merge branch 'bugfix' into emacs-sync
2022-06-04 16:18:42 -04:00
Kyle Meyer
26e6aef0ff
Update hard-coded versions for sync with Emacs
2022-05-15 17:34:55 -04:00
Kyle Meyer
fd679428e4
Merge branch 'bugfix' into emacs-sync
2022-05-15 17:34:22 -04:00
Kyle Meyer
1264ccc5f9
Update hard-coded versions for sync with Emacs
2022-04-24 21:07:01 -04:00
Kyle Meyer
6561f26843
Merge branch 'bugfix' into emacs-sync
2022-04-24 21:06:31 -04:00
Kyle Meyer
67b853d29e
Update hard-coded versions for sync with Emacs
2022-04-17 15:29:32 -04:00
Kyle Meyer
5ef858c254
Merge branch 'bugfix' into emacs-sync
2022-04-17 15:29:17 -04:00
Kyle Meyer
40378388e3
Update hard-coded versions for sync with Emacs
2022-03-20 21:30:37 -04:00
Kyle Meyer
2f302c0cf4
Merge branch 'bugfix' into emacs-sync
2022-03-20 21:30:25 -04:00
Kyle Meyer
b113f1f779
Update hard-coded versions for sync with Emacs
2022-03-06 20:17:43 -05:00
Kyle Meyer
fc99ab4fee
Merge branch 'bugfix' into emacs-sync
2022-03-06 20:17:22 -05:00
Kyle Meyer
1dbb2085ff
Update hard-coded versions for sync with Emacs
2022-02-28 00:09:59 -05:00
Kyle Meyer
bd5a04a51c
Merge branch 'bugfix' into emacs-sync
2022-02-28 00:09:42 -05:00
Kyle Meyer
5871f73b06
Update hard-coded versions for sync with Emacs
2022-02-20 14:03:46 -05:00
Kyle Meyer
28b5e6ce36
Merge branch 'bugfix' into emacs-sync
2022-02-20 14:03:23 -05:00
Kyle Meyer
797e141902
Update hard-coded versions for sync with Emacs
2022-02-13 12:42:46 -05:00
Kyle Meyer
7ba1271556
Merge branch 'bugfix' into emacs-sync
2022-02-13 12:42:32 -05:00
Kyle Meyer
06bf803681
Update hard-coded versions for sync with Emacs
2022-01-30 20:36:38 -05:00
Kyle Meyer
21fce0d9a6
Merge branch 'bugfix' into emacs-sync
2022-01-30 20:36:07 -05:00
Kyle Meyer
6b2ff7741a
Update hard-coded versions for sync with Emacs
2022-01-15 15:57:51 -05:00
Kyle Meyer
215798290b
Merge branch 'bugfix' into emacs-sync
2022-01-15 15:57:22 -05:00
Kyle Meyer
3314f9c34a
etc/schema/schemas.xml: Update copyright year
2022-01-01 17:48:26 -05:00
Kyle Meyer
ce8c1e829c
Update hard-coded versions for sync with Emacs
2022-01-01 17:48:04 -05:00
Kyle Meyer
ab6fe6d801
Merge branch 'bugfix' into emacs-sync
2022-01-01 17:47:50 -05:00
Kyle Meyer
bfd6cf7014
Update hard-coded versions for sync with Emacs
2021-12-26 15:42:24 -05:00
Kyle Meyer
a16538f7c5
Merge branch 'bugfix' into emacs-sync
2021-12-26 15:40:39 -05:00
Kyle Meyer
760c828d14
Update hard-coded versions for sync with Emacs
2021-12-18 13:44:12 -05:00
Kyle Meyer
255d5cfcb7
Merge branch 'bugfix' into emacs-sync
2021-12-18 13:43:47 -05:00
Kyle Meyer
a17ebb09d7
Update hard-coded versions for sync with Emacs
2021-12-11 12:30:27 -05:00
Kyle Meyer
d755fc5475
Merge branch 'bugfix' into emacs-sync
2021-12-11 12:30:11 -05:00
Kyle Meyer
4e27f4f77a
Update hard-coded versions for sync with Emacs
2021-12-04 21:23:21 -05:00
Kyle Meyer
e180a9df64
Merge branch 'bugfix' into emacs-sync
2021-12-04 21:23:06 -05:00
Kyle Meyer
2843668b43
Update hard-coded versions for sync with Emacs
2021-11-27 16:21:07 -05:00
Kyle Meyer
85c2d3f021
Merge branch 'bugfix' into emacs-sync
2021-11-27 16:19:56 -05:00
Kyle Meyer
7b1b2b7050
Update hard-coded versions for sync with Emacs
2021-11-20 13:08:05 -05:00
Kyle Meyer
a5f9a82b88
Merge branch 'bugfix' into emacs-sync
2021-11-20 13:07:55 -05:00
Kyle Meyer
30878f5620
Merge branch 'bugfix' into emacs-sync
2021-11-20 12:57:43 -05:00
Kyle Meyer
e0238c98a4
Update hard-coded versions for sync with Emacs
2021-11-06 14:08:57 -04:00
Kyle Meyer
9553ea907f
Merge branch 'bugfix' into emacs-sync
2021-11-06 14:08:26 -04:00
Kyle Meyer
04e1dc399c
Update hard-coded versions for sync with Emacs
2021-10-23 13:24:06 -04:00
Kyle Meyer
02d2ca275b
Merge branch 'bugfix' into emacs-sync
2021-10-23 13:23:42 -04:00
Kyle Meyer
5c4fa539f8
Update hard-coded versions for sync with Emacs
2021-10-16 13:59:19 -04:00
Kyle Meyer
0b8be90f15
Merge branch 'bugfix' into emacs-sync
2021-10-16 13:59:01 -04:00
Kyle Meyer
5bf799181b
Update hard-coded versions for sync with Emacs
2021-10-09 16:21:32 -04:00
Kyle Meyer
29caf7b4cc
Merge branch 'bugfix' into emacs-sync
2021-10-09 16:21:04 -04:00
Kyle Meyer
fedcb49430
Update hard-coded versions for sync with Emacs
2021-10-02 14:25:31 -04:00
Kyle Meyer
fbc2f9a724
Merge branch 'bugfix' into emacs-sync
...
The upcoming 9.5.1 release is the target for Emacs 28.1, but the plan
is to regularly sync with the emacs-28 branch in the meantime.
2021-10-02 14:25:09 -04:00
Kyle Meyer
aa1037a8cb
Update hard-coded versions for sync with Emacs
2021-09-29 23:04:06 -04:00
Kyle Meyer
e85bb73eb7
Org-Mode 9.5
...
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEEG+FaXQip1ZWVgUdrFDesAvc/kaIFAmFUecUACgkQFDesAvc/
kaK4Wwf+NLd907whqmOcWGwKpYHuS0D8HMadl7Qty721hr9Lq+EWZ0g3es1gjtc9
CVM2yJwvHHZwUqAGeeS2jiGP5RrFDlg7dEtLM9nQCWQ4szCQ72CrI7bV1YkAby3P
dMft7t2fcEvGSgQ0y0FYmqjnu2QbbdZd3TWWVmsPHwFvU/zthMOUmfxDBZlOBvuZ
hnb7BS/vo5S52sAU8vQhfvEoiGpSGHCNJ9mJ7fI5/DY0rLYerb0ik4beZLvF/WbE
f0sLsNWwoL997/3OL31ci6miW0o/p80k+gEsyfE4CETqEYhDKdcqvZGW2YXieHKI
gBkYPJ4p0AdAam47/gzFOBoRCUvnBQ==
=cRv3
-----END PGP SIGNATURE-----
Merge tag 'release_9.5' into emacs-sync
2021-09-29 23:03:57 -04:00
Kyle Meyer
b91b9050cb
doc: Port Emacs's b3d310fa9
...
Command:
$ git -C ../emacs format-patch \
--stdout b3d310fa9694807fc0e9c54f7ec4f6e3407402e1^- \
-- 'doc/misc/org*.org' | \
git am -p3 --directory=doc
Everything here looks okay to keep specific to the emacs-sync branch
(i.e. not apply to bugfix/main), at least for now:
* the modification-time change is already covered by 140df469e
(manual: Remove date keyword, 2021-04-19) on Org's side
* the macro change to doc/org-setup.org isn't appropriate for the
Org repo, so that should stay in the emacs-sync branch
* the change to the included license file isn't appropriate for the
Org repo (which has fdl.org instead), so this should stay in the
emacs-sync branch
* the comment to doc/org-setup.org should probably eventually be
applied to doc/doc-setup.org in bugfix/main
2021-09-29 23:01:43 -04:00
Kyle Meyer
bc8e7159ef
doc: Rename .org sources to match base names in Emacs
...
For the emacs-sync branch, this will make applying changes from the
Emacs side easier.
It also means that whoever is doing the syncing to the Emacs side only
needs to worry about putting these in the right directory, not
changing the base names.
2021-09-29 23:01:08 -04:00
Kyle Meyer
9079750e16
doc/org-manual.org: Match state initially ported to Emacs
...
fddd63f8b8 (Distribute the real source for some doc/misc manuals
(bug#45143), 2021-02-26) moved org-manual.org and doc-setup.org to
Emacs's tree from Org's d8e8a97a1
. Update the emacs-sync branch to
have those versions (doc-setup.org is already there) to make applying
subsequent patches easier.
$ git cat-file -p \
d8e8a97a14b332f40a9659993f9aefa221b79954:doc/org-manual.org \
>doc/org-manual.org
$ git cat-file -p \
d8e8a97a14b332f40a9659993f9aefa221b79954:doc/doc-setup.org \
>doc/doc-setup.org
2021-09-29 23:00:58 -04:00
Kyle Meyer
f44d0b7edd
org-version.el: Add lexical-binding cookie
...
See a50a42cea
(Use lexical-binding cookie in some trivial files,
2021-01-24).
2021-09-29 23:00:15 -04:00
Kyle Meyer
8a2b45cc0e
etc/schema/schemas.xml: Update to latest Emacs version
...
See 5214f526a
(Copy over etc/schema/schemas.xml from Emacs,
2020-12-12) for the rationale.
This is from Emacs commit b9fa57e5b06a826744fee5b4af9cc45d0ee2ff26.
2021-09-29 23:00:15 -04:00
Kyle Meyer
062b15165a
Revert doc/org.texi special handling
...
The emacs-sync branch used to track this, but the .org source is used
as of Emacs's fddd63f8b8 (Distribute the real source for some doc/misc
manuals (bug#45143), 2021-02-26).
2021-09-29 23:00:15 -04:00
Kyle Meyer
2114e04006
Revert orgguide.texi special handling
...
The plan was to start syncing a8410f946
(.gitignore: Don't ignore
doc/orgguide.texi, 2019-12-29) to the Emacs tree. That has yet to
happen, and, if it does, it should be the .org source [*], so revert
the changes on the emacs-sync branch to avoid any confusion.
[*] fddd63f8b8 (Distribute the real source for some doc/misc manuals
(bug#45143), 2021-02-26)
2021-09-29 23:00:09 -04:00
Bastien
dd9105d17c
Merge branch 'maint' into emacs-sync
2020-12-22 10:24:58 +01:00
Bastien
024d97527d
Update hard-coded versions for sync with Emacs
2020-12-22 10:21:03 +01:00
Bastien
8d018d3cd6
lisp/org.el: Bump version to 9.4.4
2020-12-22 10:20:38 +01:00
Bastien
a7cd3eccf8
org-agenda.el and org-capture.el: Remove `generated-autoload-file'
...
* lisp/org-agenda.el: Remove `generated-autoload-file' local
variable.
* lisp/org-capture.el: Ditto.
This is a continuation of a4e6a6fa7
which fixes fae16ed8f
.
Reported-by: Andrii Kolomoiets <andreyk.mad@gmail.com>
2020-12-22 09:25:29 +01:00
Kyle Meyer
7f649322f9
doc: Generate texi files for sync with Emacs
...
Created via `make info`.
2020-12-16 09:48:28 -05:00
Kyle Meyer
022fb3c211
Update hard-coded versions for sync with Emacs
2020-12-16 09:44:42 -05:00
Kyle Meyer
9edff03529
Adding release tag
...
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEEG+FaXQip1ZWVgUdrFDesAvc/kaIFAl/Z1mQACgkQFDesAvc/
kaJbyAf9FFXOhw6e5u9iba3dxyvtrEEwufS4u/X2uwXJht9zMMg+FnlHr9hAokVd
0VhX6hDhxOGRlA0NwslHrdvXzCYIByEkjjE/D+rpAXbdyvH6e+d/+in3rfyUvddd
/BTzCvYraX8BykzbUfGHDXadmDIM4/ZTilvoAUcI31FtVd0peob+LwEQZluKciyb
0wB53jCO7Teqf9crC7trDTDHZ31Xv0qm2V+whPbq+uahkNLA1fPpcvKxy1uOTMyA
lTmhaikqo9QIqJ0riYDPPClLDTzsuAOwUgeaspw9csQViVDzvYtlFTk2Fwj6CCCF
z4OTWGa1xZqwtazYweJ77JB5S2cfHQ==
=kgjs
-----END PGP SIGNATURE-----
Merge tag 'release_9.4.3' into emacs-sync
2020-12-16 09:43:46 -05:00
Kyle Meyer
c5471c2d66
ORG-NEWS: Prune 9.5 section
...
This probably shouldn't have been on the maint branch, but it
certainly shouldn't be in the sync (and was removed manually in the
last one at f22856a5c5).
2020-12-13 15:24:32 -05:00
Kyle Meyer
2641166f55
Update hard-coded versions for sync with Emacs
2020-12-13 15:23:27 -05:00
Kyle Meyer
7b7f6c154c
Adding release tag
...
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEEG+FaXQip1ZWVgUdrFDesAvc/kaIFAl/WdTcACgkQFDesAvc/
kaIm9wf+Kuj2AXFhsIyqMF6nkF6wGh7Tn1tyPV5aV/KWp8+uk5l+ID1IZWAsscvx
eIBugpAjUARLjrHrj1vVbqz0Y+Ey9/SoSJyCiGsUEhDJdeAKywky7JGQrJtPMHqJ
vC/SWPsZVb6vbAOfOdz20dEqkxF451A9n/IBoqdadwsGQ7NVkibpo4CeoimqidBy
vk86Ar9p9VlnQOXzrOSnLaIzpMEH/trPIH35W8vkLM6BAmHuzVyr2L8XMw6uE0/m
39eMbbAGgFA0/juBaACy1cg9cWPN6tbXtHYeabeEneiO3UQ4EP8gv2B4wOC9DWZj
Q8DknDrKENFfJZfe9Gi7QUeKwbLnQw==
=kOmv
-----END PGP SIGNATURE-----
Merge tag 'release_9.4.2' into emacs-sync
2020-12-13 15:22:56 -05:00
Kyle Meyer
c2069daf9b
Track org-version.el
...
This file is needed for the emacs-sync, but if it's generated from the
emacs-sync, then the syncer needs to manually remove the hash from
org-git-version so it matches the output when the main release tag is
checked out.
Instead track it here and update the versions when the other
hard-coded versions are bumped.
2020-12-13 15:22:05 -05:00
Kyle Meyer
353bb43ac7
doc: Generate texi files for sync with Emacs
...
Created via `make info`.
2020-12-12 14:57:52 -05:00
Kyle Meyer
d3645c04f5
Update hard-coded versions for sync with Emacs
2020-12-12 14:57:51 -05:00
Kyle Meyer
de7522661d
Merge branch 'maint' into emacs-sync
2020-12-12 14:57:16 -05:00
Kyle Meyer
5214f526ad
Copy over etc/schema/schemas.xml from Emacs
...
worg's org-maintenance.org says:
schema/schemas.xml
Any new entries in this file should be added to
emacs/etc/schema/schemas.xml.
But that's easy to forget and instead clobber with an overwrite, as in
bug#42851. So instead, let's keep the full version in the emacs-sync
branch. If there are any changes on our end, there will then be merge
conflicts, and we can deal with adding the entries when merging into
emacs-sync branch rather when copying to the emacs repository.
This file is from the current emacs-27 branch (6aa9fe3e1b).
2020-12-12 14:52:40 -05:00
Kyle Meyer
cd6c8921bf
doc: Generate texi files for sync with Emacs
...
Created via `make info`.
2020-11-28 02:05:01 -05:00
Kyle Meyer
dc6d2b8d86
Update customize-package-emacs-version-alist
...
* lisp/org.el (customize-package-emacs-version-alist): Map Org 9.4 to
Emacs 27.2.
9.4.x, rather than 9.3.8, may be synced for the upcoming Emacs 27.2
release (bug#43268, <87lfeo3vzg.fsf@bzg.fr>).
(cherry picked from commit b2717ca5a7
)
2020-11-28 02:01:21 -05:00
Kyle Meyer
af59739677
Update hard-coded versions for sync with Emacs
2020-11-28 02:00:41 -05:00
Kyle Meyer
d77f08be8a
Release Org 9.4
...
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEEG+FaXQip1ZWVgUdrFDesAvc/kaIFAl9fdTEACgkQFDesAvc/
kaJd9ggAvgnPJx4+HP+KBW43yRD1Uk0yOwivBE+5IdXNGvBglcbhuUCgIc2UWG1n
KAI4QSV6CCHdfEK0fZmR7AtW/luBAPeUN4VpcyLO5fTaedMFWUr/j83uiQxZCTk9
nkv3u8XgZ4dRAt+BJArZyMSjMafmcIv9NFJ0/lfMct5WcR6GLChMzLc3++dHD/CH
9seJhWYdwU8U/rAq9Qh/o6Yo8Vhsn0TDQ8ZDY+zl4WQK/lygxielYTWHywUftEs/
9CTwA3kTI9vDFp/znM4h580bEGxK7qfhgGmD9+nvK3btESvyMkVXey6jtyvN5A0M
Jdd0XHTVoD1D/OGVN7QQiomdZc+BUA==
=BPk7
-----END PGP SIGNATURE-----
Merge tag 'release_9.4' into emacs-sync
2020-11-28 01:58:09 -05:00
Stefan Kangas
f7dc6be22d
Backport commit 78eacf31e from Emacs
...
; Fix many typos in symbols in docs and comments
78eacf31e8fe182801ad1943fac717b75fcf286b
Stefan Kangas
Fri Oct 2 13:29:45 2020 +0200
(cherry picked from commit ddcccbc012
)
2020-10-04 15:07:26 -04:00
Kyle Meyer
1383b5c200
doc: Regenerate texi files with double-escaping fix
2020-09-07 21:19:59 -04:00
Kyle Meyer
c0d44cf1ba
Merge branch 'maint' into emacs-sync
2020-09-07 21:16:26 -04:00
Kyle Meyer
b60e58d2ea
doc: Generate texi files for sync with Emacs
...
Created via `make info`.
2020-09-07 18:06:42 -04:00
Kyle Meyer
e58f2cd775
Update hard-coded versions for sync with Emacs
2020-09-07 18:03:31 -04:00
Kyle Meyer
e0d111292d
Adding release tag
...
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEEG+FaXQip1ZWVgUdrFDesAvc/kaIFAl9WVPAACgkQFDesAvc/
kaIfWgf/axD05NA/MwSbx61lDgtTEwIpkeC5AUBOJhmtzh7wURQmo2gWAtVxw06A
JOH1pWMfPEHxlcpJKfEpUR5sKHC3kFX5Qjr+pQOh27DA0Ebb5Mqi34Txs6cTNWiZ
SLDNMG3o/bsVjNfrdaSGNLdG3Ajjujnjx+2SKRlNyROVZeqOwdFZdKMfjn0s9ljn
kX3xb2u28Vg5znwwriRSkkZdLltpYvZW9cXEwS/PyNcj+QhD5XNhaC22D8Am57PT
58ejRO62x/S3Rv7yxZPt/I4TKCbLnDgJ6T9ZdSyW6RqDOW7vW03GOB4hdT5Ts6GJ
IVv1t5zD+5liNaeEjVEXfgd0am3ZRA==
=tD2R
-----END PGP SIGNATURE-----
Merge tag 'release_9.3.8' into emacs-sync
Adding release tag
# gpg: Signature made Mon 07 Sep 2020 11:42:40 AM EDT
# gpg: using RSA key 1BE15A5D08A9D5959581476B1437AC02F73F91A2
# gpg: Can't check signature: No public key
2020-09-07 18:02:43 -04:00
Kyle Meyer
e0b59bc085
doc: Generate texi files for sync with Emacs
...
Created via `make info`.
2019-12-29 11:22:30 -05:00
Kyle Meyer
a8410f946f
.gitignore: Don't ignore doc/orgguide.texi
...
orgguide.texi has never been included in the sync with the Emacs
repository. The plan is to start doing so.
<https://lists.gnu.org/archive/html/emacs-orgmode/2019-12/msg00249.html >
2019-12-29 10:57:19 -05:00
Kyle Meyer
4aae8df098
Update hard-coded versions for sync with Emacs
2019-12-29 10:53:23 -05:00
Kyle Meyer
84f72ac69d
Org-Mode 9.3.1
...
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEEG+FaXQip1ZWVgUdrFDesAvc/kaIFAl4E+QkACgkQFDesAvc/
kaJ7MAgAlY9s0UZ1eSpB1TfYLRR0+wL6LpqcCuPV2A8dK7hZKG1cZw1RiSxt2hf2
gtw9M81M+xHjbB7kGCrzE6nti30BqWvtKCRhQCxtypG572yKiyvWYbmBux6oFduN
PTRv17EFZ+5H7RA4tjZB95zjpTpi6IS4yaUvN2Lobd8zMeDV1lWV/qNu8/Di6BbK
KM1V6GFLjj/wvIvATiWqXBx0VVI4WnjnZWTRGjE3+vMen5s3+1mnLtpFr1Kx1WaV
EnhKgnOehzYshOM3k36xIvOu5e4vcaohJfe+DItSk+I9LSlQXgjV2S6NoayvSMta
M6VXxzEwf9Q8O9iL1/+vhS1DryOSqQ==
=R6YA
-----END PGP SIGNATURE-----
Merge tag 'release_9.3.1' into emacs-sync
Org-Mode 9.3.1
# gpg: Signature made Thu 26 Dec 2019 01:16:41 PM EST
# gpg: using RSA key 1BE15A5D08A9D5959581476B1437AC02F73F91A2
# gpg: Can't check signature: No public key
2019-12-29 10:52:52 -05:00
Kyle Meyer
ba228ee82e
org.texi: Generate from org-manual.org
...
$ emacs --batch -Q -L lisp --eval "(require 'ox-texinfo)" \
--visit doc/org-manual.org --eval "(org-texinfo-export-to-texinfo)"
2019-12-03 21:57:27 -05:00
Kyle Meyer
317028952e
Update hard-coded versions for sync with Emacs
2019-12-03 21:57:27 -05:00
Kyle Meyer
5221d4a12d
Clean up spacing to pass Emacs's pre-commit check
...
(cherry picked from commit 8cd225a36c
)
2019-12-03 21:57:27 -05:00
Glenn Morris
179f2d019e
Backport commit 94c5eeb1f from Emacs
...
; Fix copyright years and license notices for recent org files
94c5eeb1fd33b043f68c4021fa0aed0e5590763e
Glenn Morris
Tue Dec 3 17:19:14 2019 -0800
(cherry picked from commit f4d8622bc6
)
2019-12-03 21:31:04 -05:00
Kyle Meyer
fd7a417a5d
Org-Mode 9.3
...
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEEG+FaXQip1ZWVgUdrFDesAvc/kaIFAl3mfr0ACgkQFDesAvc/
kaJx/Af/cLkY2KZjmJyVPMV9XbZb/izD2JpXBUJqnQATHLA78PmdF5c5YuydcqrA
4RFrjNxVUcr1u6O8W4RQ0VDH+nhis5+QXrVHhDR1MTGvaRlogOBMCRolceMpKBm8
VWG+AAmbFfBtI85YJhoGBTMi/KAnrM1EKql0qhnMvR27niZd1rl7+qbq7qWNXTLt
SmqbpwShcul2oKlswl5E6wcE/fHp+zbbaOyWkBsvMt+wDUj/UgH6La7+RuSYiRCt
8VWUmLmnaQmjX12cAuODPELECDc7kDPAwBQfCsu/ZJJoCJCXbgVo3a3eLyID1BGV
QXTZR7LH4kpmjb/xJL86eaj/unfVPQ==
=7vPc
-----END PGP SIGNATURE-----
Merge tag 'release_9.3' into emacs-sync
Org-Mode 9.3
2019-12-03 21:27:42 -05:00
Kyle Meyer
1130e5bc89
org.texi: Generate from org-manual.org
...
$ emacs --batch -Q -L lisp --eval "(require 'ox-texinfo)" \
--visit doc/org-manual.org --eval "(org-texinfo-export-to-texinfo)"
2019-09-07 16:51:27 -04:00
Kyle Meyer
1f0a0cd4a0
Update hard-coded versions for sync with Emacs
2019-09-07 16:48:25 -04:00
Kyle Meyer
bff2f97b22
Adding release tag
...
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEEG+FaXQip1ZWVgUdrFDesAvc/kaIFAl1vQ38ACgkQFDesAvc/
kaKMNAgAhPFwl7VJ6mnKPkBfQWclYKWZTKDhRqnX1BQ1uamvZsbuPqVpWjmlAWos
TvNqNOkXTpVlMJnR0UeSogrEkWT7Gwnzi3bbkSAVbQ/LqbLw8hH6JCD1zLOxiR14
NjwDzBcG7WW5Ev6W9OSSi0j6ZZSdm4ekH9f0NyiF+PS96GZulLpStnBn7aLCizjZ
tUwwERlu/izio55lInWFEKq3YZu5sMQfoPh44iiqDhaFA8i4OqXe7v3510soGyX5
wJT3AcvlDe5/K2JJC7Y5j4gVDs8EBmVmmaXmdfp18MY+ufRvIFlKnwQ5RKQcLe2R
tLg14uGQOS67qrsOwS/+3bqlq9S5pg==
=1YrF
-----END PGP SIGNATURE-----
Merge tag 'release_9.2.6' into emacs-sync
Adding release tag
# gpg: Signature made Wed 04 Sep 2019 12:54:23 AM EDT
# gpg: using RSA key 1BE15A5D08A9D5959581476B1437AC02F73F91A2
# gpg: Can't check signature: No public key
2019-09-07 16:47:53 -04:00
Kyle Meyer
02a90a23fa
org.texi: Generate from org-manual.org
...
$ emacs --batch -Q -L lisp --eval "(require 'ox-texinfo)" \
--visit doc/org-manual.org --eval "(org-texinfo-export-to-texinfo)"
2019-06-11 19:39:32 -04:00
Kyle Meyer
d63db9a16a
Update hard-coded versions for sync with Emacs
2019-06-11 19:36:45 -04:00
Kyle Meyer
7d77083db0
Adding release tag
...
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEEG+FaXQip1ZWVgUdrFDesAvc/kaIFAlz/wNAACgkQFDesAvc/
kaJS5ggAp5ArbjubQMR4/7T4efdzRpiEaq1znSQYOAReTuB42e7Tqgw1UPAvliAs
X17y+To3Rulok5RPGn1V3GyxteYXN6E9LXUTgQj77AEE4DbhTgR+kFR4XN8RudNP
EBzoiQSiRwfNS1f8+vYoaxWOCV/5NkdY/x8ZUNekYy9POfdiPm9Ukq+kdn2uP2ni
dntyfCS1/NDNS/1HR+pSn4/AyWXnJ6OrjIdsAP0zWRoxQK5QpwstE3LIA027IZLw
+9pJbJN7+nAO37o9NegEzvuJ06VtihaGm84U0iR30Z/tPbDJLlbT+60rXdMoQWP1
VDdBkHIUe0kB7GpQd+zC0Ba60FAMKA==
=Klcl
-----END PGP SIGNATURE-----
Merge tag 'release_9.2.4' into emacs-sync
Adding release tag
# gpg: Signature made Tue 11 Jun 2019 10:55:12 AM EDT
# gpg: using RSA key 1BE15A5D08A9D5959581476B1437AC02F73F91A2
# gpg: Can't check signature: No public key
2019-06-11 19:36:09 -04:00
Kyle Meyer
eccfb58167
org.texi: Generate from org-manual.org
...
$ emacs --batch -Q -L lisp --eval "(require 'ox-texinfo)" \
--visit doc/org-manual.org --eval "(org-texinfo-export-to-texinfo)"
2019-04-02 19:23:22 -04:00
Kyle Meyer
fb081c1dc0
Update hard-coded versions for sync with Emacs
2019-04-02 19:23:22 -04:00
Paul Eggert
fd71918993
Backport commit f9ff60e0d from Emacs
...
* lisp/org-eshell.el (org-eshell-open):
* lisp/org.el (org-deadline-time-hour-regexp)
(org-scheduled-time-hour-regexp):
Avoid attempts to chain ranges, as this can be confusing.
For example, instead of [0-9-_.], use [0-9_.-].
Improve regexp advice again, and unchain ranges
f9ff60e0d7288e30cdbd1e43225059f1374441f1
Paul Eggert
Tue Apr 2 15:01:34 2019 -0700
(cherry picked from commit b0324a7405
)
2019-04-02 19:23:22 -04:00
Kyle Meyer
3061f90a63
Adding release tag
...
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEEG+FaXQip1ZWVgUdrFDesAvc/kaIFAlyjAccACgkQFDesAvc/
kaKhFgf/cHi+zTjUVUZ00jrGiSkKDnK0PxxjB8VVW+eUZwKBTFjFTS6690Smif/f
ehHbSqmfSUbytvCxs4vp/oYVwXzohKhEVRYrHSnJWXYOEo8L6esa8HcqhAJvoZ28
MVVO6Ba5suo01LZvYYfN+uktV5Tm3xPo7nkkKeByp2VUaj9Q8oFL7/9tFCe4fR+y
d2rghk6XkXaGgWSEzPDWmVazGTUn4Ws0I4xh27RGkiXmod3G7OuPqKhueHWrAEzT
28z111jn5BlY9FKpZtdZgVE0EUUM1izbZxBqPUvZIoky4YIQzMINNJkHy0N6C3vd
A7pVqgcKxxK8X7iLNHIMG16+X+geMg==
=GI4N
-----END PGP SIGNATURE-----
Merge tag 'release_9.2.3' into emacs-sync
Adding release tag
# gpg: Signature made Tue 02 Apr 2019 02:31:35 AM EDT
# gpg: using RSA key 1BE15A5D08A9D5959581476B1437AC02F73F91A2
# gpg: Can't check signature: No public key
2019-04-02 19:03:25 -04:00
Kyle Meyer
90c50d4aa8
org.texi: Generate from org-manual.org
...
$ emacs --batch -Q -L lisp --eval "(require 'ox-texinfo)" \
--visit doc/org-manual.org --eval "(org-texinfo-export-to-texinfo)"
2019-02-03 19:23:50 -05:00
Kyle Meyer
0fb79857a1
.gitignore: Don't ignore texi
...
The generated org.texi will be needed for the sync with Emacs.
2019-02-03 19:23:50 -05:00
Kyle Meyer
d5f6acf957
Update hard-coded versions for sync with Emacs
2019-02-03 19:23:50 -05:00
Kyle Meyer
413c03a6f6
ORG-NEWS: Fix copyright year
...
(cherry picked from commit 69c9f632f4
)
2019-02-03 19:23:33 -05:00
Kyle Meyer
9a50471419
Adding release tag
...
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEEG+FaXQip1ZWVgUdrFDesAvc/kaIFAlxXEnkACgkQFDesAvc/
kaL+4QgAhypK4s3Kl2+MvFZxwBJ2GPLaN7itl03Q+RzEOZe0qbnZz/GBvbb0DllT
G4nRLG25yVZ5XeksGeANBTetPvLwOopHtmuuCLQRiKpe5IcNdvZB91AtWm4Mi32r
t+AhPdSjr14CwRnKnGnGXT3+DfzkPDERr4UO3HZRsAPrI51yem7IoGgX4xpFsvvR
LgYHPiAqDe3oQ4+r+KGpqJsrwIe3zK8n+bv02ramBzHTh2chfo850hkSNvH8zsXg
KemaYbd2oxYzPeI2ceBHht0rc5Eki8hbKBPWcFOJFIAIpa59ZOEvcDbHfAKIcCOh
bHnshmS8GG4IPF0cyzTOq6lW5/gldQ==
=dle2
-----END PGP SIGNATURE-----
Merge tag 'release_9.2.1' into emacs-sync
2019-02-03 18:23:32 -05:00
Kyle Meyer
c5fbd6db10
Update hard-coded versions for sync with Emacs
2018-08-26 13:12:59 -04:00
Kyle Meyer
73dc19d965
Merge branch 'maint' into emacs-sync
2018-08-26 13:12:38 -04:00
Kyle Meyer
1648627783
Update hard-coded versions for sync with Emacs
2018-05-06 02:30:09 -04:00
Kyle Meyer
ac94897c2c
Merge branch 'maint' into emacs-sync
2018-05-06 02:29:17 -04:00
Kyle Meyer
c9d49a40ec
Update hard-coded versions for sync with Emacs
2018-04-27 19:18:40 -04:00
Kyle Meyer
2540608fba
Merge branch 'maint' into emacs-sync
2018-04-27 19:13:14 -04:00
Kyle Meyer
a0cfd6345a
Update hard-coded versions for sync with Emacs
2018-04-22 11:12:05 -04:00
Kyle Meyer
7f3fa4d99b
Merge branch 'maint' into emacs-sync
2018-04-22 11:10:30 -04:00
Kyle Meyer
67baa56c78
Update hard-coded versions for sync with Emacs
2018-04-22 11:06:11 -04:00
Kyle Meyer
cbe154c27c
Merge branch 'maint' into emacs-sync
2018-04-22 11:04:26 -04:00
Rasmus
e235ec232c
org.el: Fix whitespace issue blocking upstream commit
...
(cherry picked from commit ab488dc438
)
2018-03-27 18:23:26 -04:00
Kyle Meyer
5e4542d698
Update hard-coded versions for sync with Emacs
2018-03-26 18:43:22 -04:00
Kyle Meyer
c8605f1ef6
Merge branch 'maint' into emacs-sync
2018-03-26 18:42:14 -04:00
Glenn Morris
9a6657be6c
Backport commit 7d6c7d0b4 from Emacs
...
; Use GNU not Gnu in docs
7d6c7d0b461705fd67f7df1096b6f6376931f140
Glenn Morris
Fri Mar 23 16:01:12 2018 -0400
(cherry picked from commit 8cf787cbad
)
2018-03-26 00:10:17 -04:00
Glenn Morris
90ae1bd52a
Backport commit a6a821d29 from Emacs
...
* lisp/ob-lisp.el (org-babel-lisp-eval-fn): Tweak type.
Avoids type mismatch when relevant library is not present/loaded.
a6a821d29bda3e45fb26289e6119359ea3b91ebb
Glenn Morris
Thu Mar 22 14:37:45 2018 -0400
(cherry picked from commit b45c1ff4d4
)
2018-03-26 00:10:07 -04:00
Kyle Meyer
4e0175fb29
Update version keyword
...
As of fffd300ef
(Update version keyword, 2018-02-24), this should be
bumped with each release.
(cherry picked from commit fa15abe6e8
)
2018-03-22 09:20:22 -04:00
Kyle Meyer
b01880b2a1
Update hard-coded versions for sync with Emacs
2018-03-22 08:42:28 -04:00
Kyle Meyer
bd3b72669a
Merge branch 'maint' into emacs-sync
2018-03-22 08:40:08 -04:00
Glenn Morris
f23825d241
Backport commit 16faff6a4 from Emacs
...
; * lisp/org/org-table.el: Replace obsolete alias in comment.
16faff6a46f28b4db2e9b91e52b27404303f3197
Glenn Morris
Fri Mar 9 12:43:21 2018 -0500
(cherry picked from commit 04f06958ab
)
2018-03-09 23:42:52 -05:00
Paul Eggert
c389c696c0
Backport commit f2caf08ca from Emacs
...
; Spelling fixes
f2caf08ca625f64c7eeea8dfa8f65a5b1bac58e2
Paul Eggert
Sun Mar 4 17:10:34 2018 -0800
(cherry picked from commit 9ac80ede5e
)
2018-03-07 22:09:57 -05:00
Michael Albinus
6b18fb11ea
Backport commit 9743f48de from Emacs
...
* doc/org.texi: Mark keys consistently.
Mark keys consistently in manuals
9743f48de7325bd95a42e1a27acbf6635f8d086b
Michael Albinus
Mon Feb 26 13:53:37 2018 +0100
(cherry picked from commit e810e6e5f9
)
2018-02-26 21:44:21 -05:00
Michael Albinus
f398cd9519
Backport commit ce557a924 from Emacs
...
* doc/org.texi: Remove @key{} markups from @kindex entries.
Remove @key{} markups from @kindex entries in manuals
ce557a924a299650b5e0c93ba276f1ec651f7941
Michael Albinus
Mon Feb 26 09:24:39 2018 +0100
(cherry picked from commit c0de50216a
)
2018-02-26 21:44:21 -05:00
Michael Albinus
940b2ac0ec
Backport commit 7a069f35d from Emacs
...
* doc/org.texi: Fix @kindex entries. Mark keys consistently.
Fix @kindex entries in manuals
7a069f35d4ce002dc10d666fde2850d8e6eee427
Michael Albinus
Sun Feb 25 16:29:39 2018 +0100
(cherry picked from commit 5c3a00575b
)
2018-02-26 21:44:20 -05:00
Michael Albinus
495aad671f
Backport commit e415309fe from Emacs
...
* doc/org.texi: Fix @cindex entries. Use consistently
@code{} for keywords.
Fix @cindex entries in org.texi
e415309fef4077fe7e4dfe1a898d749c1136ca2c
Michael Albinus
Sat Feb 24 20:40:39 2018 +0100
(cherry picked from commit bb2195a1c0
)
2018-02-26 21:44:20 -05:00
Kyle Meyer
6f185c69f5
Update hard-coded versions for sync with Emacs
2018-02-26 21:26:45 -05:00
Kyle Meyer
58fcef1f5d
Merge branch 'maint' into emacs-sync
2018-02-26 21:25:15 -05:00
Kyle Meyer
96b33f2e38
Update copyright years
...
(cherry picked from commit 3e1641ef0a
)
2018-01-07 00:29:09 -05:00
Kyle Meyer
593b06c55d
Update hard-coded versions for sync with Emacs
2018-01-07 00:19:39 -05:00
Kyle Meyer
7f43614f2b
Merge branch 'maint' into emacs-sync
2018-01-07 00:16:11 -05:00
Kyle Meyer
4d97d7c01f
ob-haskell: Fix indentation from b46787743
...
This fails Emacs's pre-commit check (lisp/org/ob-haskell.el:77: space
before tab in indent).
(cherry picked from commit 5696f353dc
)
2017-12-25 12:33:13 -05:00
Kyle Meyer
f7a2559a8f
Update hard-coded versions for sync with Emacs
2017-12-25 12:32:10 -05:00
Kyle Meyer
3db01cd656
Merge branch 'maint' into emacs-sync
2017-12-25 12:32:03 -05:00
Kyle Meyer
fe73105a13
Update hard-coded versions for sync with Emacs
2017-12-05 13:15:12 -05:00
Kyle Meyer
319e3174b5
Merge branch 'maint' into emacs-sync
2017-12-05 13:14:44 -05:00
Kyle Meyer
d4af7a6fc3
Update hard-coded versions for sync with Emacs
2017-11-16 22:12:21 -05:00
Kyle Meyer
594201d414
Merge branch 'maint' into emacs-sync
2017-11-16 22:11:28 -05:00
Paul Eggert
6ca9068b6f
Backport commit 5172fa02c from Emacs
...
Prefer HTTPS to HTTP for gnu.org
5172fa02cccaab2500ecf85aaf65b8deed54d42e
Paul Eggert
Sun Oct 1 19:59:01 2017 -0700
(cherry picked from commit 710a3d1131
)
2017-10-04 10:47:33 -04:00
Kyle Meyer
c9288cefee
Update hard-coded versions for sync with Emacs
2017-10-04 10:30:47 -04:00
Kyle Meyer
44698ec2cb
Merge branch 'maint' into emacs-sync
2017-10-04 10:29:19 -04:00
Kyle Meyer
b1e8b5240d
Update hard-coded versions for sync with Emacs
2017-09-17 10:41:10 -04:00
Kyle Meyer
879dfddd87
Merge branch 'maint' into emacs-sync
2017-09-17 10:36:29 -04:00
Kyle Meyer
e455d5a509
orgcard.tex: Adjust source line for Emacs's bc511a64f
...
This change touches Emacs-specific lines that are not present in Org's
main branches.
2017-09-17 01:15:50 -04:00
Kyle Meyer
f7d6541dbf
Adjust the license link in new lisp/*.el files
...
Emacs's bc511a64f6d made tree-wide changes to prefer https to http.
For Org, this resulted in the header of every lisp/*.el file being
changed. Make the same changes in lisp/*.el files that were added
since Org version 9.0.10 (the last version that was synced with
Emacs).
(cherry picked from commit e4a0fd6b02
)
2017-09-17 01:15:50 -04:00
Paul Eggert
4560ca6043
Backport commit bc511a64f from Emacs
...
Prefer HTTPS to FTP and HTTP in documentation
bc511a64f6da9ab51acc7c8865e80c4a4cb655c2
Paul Eggert
Wed Sep 13 15:54:37 2017 -0700
(cherry picked from commit ff0dcf52a5
)
2017-09-17 00:37:47 -04:00
Paul Eggert
dd71461277
Backport commit 5da53a019 from Emacs
...
* lisp/org-info.el (org-info-other-documents)
(org-info-map-html-url):
* lisp/ox-html.el (org-html-creator-string): Use HTTPS instead of
HTTP.
Prefer HTTPS to HTTP for gnu.org
5da53a01912c2f5d46f5df4ef8cc13a34b5017d4
Paul Eggert
Wed Sep 13 15:54:25 2017 -0700
(cherry picked from commit d4d7cda57f
)
2017-09-17 00:37:26 -04:00
Paul Eggert
744c155284
Backport commit 74b8615fc from Emacs
...
* lisp/ob-tangle.el (org-babel-tangle-publish): Port to new copy-file
behavior.
Adjust ob-tangle to new copy-file behavior
74b8615fcceba7b92c4938e1bcc92015f10ae899
Paul Eggert
Sun Sep 10 22:31:23 2017 -0700
(cherry picked from commit d3912e7f32
)
2017-09-17 00:37:26 -04:00
Paul Eggert
166d0af437
Backport commit cdef84fb6 from Emacs
...
Spelling fixes
cdef84fb6893f69ffee1a99fe82a262e02e59bf5
Paul Eggert
Sun Sep 10 09:24:37 2017 -0700
(cherry picked from commit a4f1395cbe
)
2017-09-11 09:43:10 -04:00
Kyle Meyer
4df914a539
Update hard-coded versions for sync with Emacs
2017-09-06 12:00:52 -04:00
Kyle Meyer
18b6ab59cb
Merge branch 'maint' into emacs-sync
2017-09-06 11:27:01 -04:00
Kyle Meyer
32a5122986
orgcard.tex: Restore dropped line from 54aadd94f
2017-08-29 09:29:22 -04:00
Paul Eggert
88e3570b21
Backport commit 05f9ffd53 from Emacs
...
* doc/org.texi (Batch execution): Simplify example script so that it
does not need expand-file-name and thus will not mishandle file names
with leading ~.
Improve expand-file-name doc
05f9ffd53c65699e8de6cca4817b1f2dc2f63a79
Paul Eggert
Fri Aug 25 21:14:06 2017 -0700
(cherry picked from commit ca7d3bd77c
)
2017-08-27 10:16:04 -04:00
Kyle Meyer
ba0281e3f9
org.texi: Add date for emacs sync
...
See https://lists.gnu.org/archive/html/emacs-devel/2017-06/msg00523.html
2017-08-27 10:15:32 -04:00
Kyle Meyer
15ba8ad04e
org.texi: Update version for sync with Emacs
2017-08-27 09:43:54 -04:00
Kyle Meyer
54aadd94f6
orgcard.tex: Adjust for sync with Emacs
...
Insert the version number in orgcard.tex before it is synced with the
Emacs repo because, as of a8d007db1
, the Org's Makefile auto-generates
the orgcard.tex's version number.
2017-08-27 09:43:54 -04:00
Kyle Meyer
61d1be9ce7
Merge branch 'maint' into emacs-sync
2017-08-27 09:19:48 -04:00
Kyle Meyer
bbe32366ef
etc/styles/README: Update copyright year
...
This has not been getting updated during the bulk copyright year
updates.
(cherry picked from commit 17a1cd23b9
)
2017-06-22 13:35:47 -04:00
Kyle Meyer
a6211b757b
Clean up spacing to pass Emacs's pre-commit check
...
This is in preparation for syncing with the Emacs repo.
(cherry picked from commit f2980782c4
)
2017-06-22 13:35:47 -04:00
Paul Eggert
559f7fa828
ORG-NEWS: Backport commit dc152c54f from Emacs
...
Modernize usage of 'macOS' in doc and comments
dc152c54f4e44f5f2040883b03f71ff6aa66c893
Paul Eggert
Sun Nov 6 00:42:03 2016 -0700
(cherry picked from commit 549c2cb75e
)
2017-06-22 13:35:47 -04:00
Paul Eggert
203fd0cead
ORG-NEWS: Backport commit 62803a2ef from Emacs
...
Specify coding if Latin-1 Emacs would misinterpret.
62803a2ef134e37f1ba2c404dda15bf5e2a2a036
Paul Eggert
Sat May 24 15:23:47 2014 -0700
(cherry picked from commit 265ee374c0
)
2017-06-22 13:35:47 -04:00
Kyle Meyer
f2ae5fbc95
org.texi: Update version for sync with Emacs
...
See c204e9c3d
(org.texi: Adjust for sync with Emacs, 2017-01-26).
2017-06-22 09:48:38 -04:00
Kyle Meyer
81eb4d7575
Merge branch 'maint' into emacs-sync
2017-06-22 09:48:14 -04:00
Kyle Meyer
d58a8aabce
org.texi: Clean up spacing to pass Emacs's pre-commit check
...
Like c1822e556
(2017-01-25), this is in preparation for syncing with
the Emacs repo.
(cherry picked from commit 2ab2a420a6
)
2017-06-19 23:39:24 -04:00
Kyle Meyer
fcd0ae0343
org.texi: Update version for sync with Emacs
...
See c204e9c3d
(org.texi: Adjust for sync with Emacs, 2017-01-26).
2017-06-19 21:28:42 -04:00
Kyle Meyer
e5224694d3
Merge branch 'maint' into emacs-sync
2017-06-19 21:27:55 -04:00
Kyle Meyer
391ba6b82b
org.texi: Update version for sync with Emacs
...
See c204e9c3d
(org.texi: Adjust for sync with Emacs, 2017-01-26).
2017-05-15 17:49:18 -04:00
Kyle Meyer
db91535701
Merge branch 'maint' into emacs-sync
2017-05-15 17:48:34 -04:00
Kyle Meyer
58e16bec1f
org.texi: Update version for sync with Emacs
...
See c204e9c3d
(org.texi: Adjust for sync with Emacs, 2017-01-26).
2017-05-02 11:25:48 -04:00
Kyle Meyer
275173ddcd
Merge branch 'maint' into emacs-sync
2017-05-02 11:21:12 -04:00
Kyle Meyer
b39205cb68
Merge branch 'maint' into emacs-sync
2017-02-10 19:01:58 -05:00
Kyle Meyer
836c2d385d
Merge branch 'maint' into emacs-sync
2017-02-08 21:48:04 -05:00
Kyle Meyer
a726fc83db
Merge branch 'maint' into emacs-sync
2017-01-29 13:27:07 -05:00
Kyle Meyer
ea3e096d97
Merge branch 'maint' into emacs-sync
2017-01-26 22:17:04 -05:00
Kyle Meyer
c204e9c3d7
org.texi: Adjust for sync with Emacs
...
Based on Emacs's 6f66f53f65 (Fix previous change, 2014-01-07) and
ae0cb5361e (Remove org-docbook.el, which is not in Org 8.2.3a. Fix
error in org.texi header., 2013-11-12).
Note that the header is set to 9.0.5 assuming that there will be one
more release from maint before syncing.
2017-01-26 00:59:57 -05:00
Kyle Meyer
b0ced1484a
orgcard.tex: Adjust for sync with Emacs
...
Based on Emacs's e90dec2be1 (* etc/refcards/orgcard.tex: Revert part
of previous change., 2014-01-07).
Note, however, that \orgversionnumber is still at 8.2 in the Org repo.
We update information that out-of-date and then set it to the
appropriate version number.
2017-01-26 00:59:46 -05:00
Glenn Morris
c34d9a2a1e
Backport commit 6d27423d3 from Emacs
...
* doc/orgcard.tex: Tweak documentation url.
Tweak refcard note about documentation location
6d27423d381c3496e76e8d57e0d81841cdde0815
Glenn Morris
Sun Nov 27 16:38:56 2016 -0800
2017-01-26 00:40:10 -05:00
Glenn Morris
ebc896d769
Backport commit 4af5981dc from Emacs
...
* doc/orgcard.tex: Add comment about the source.
Add a comment in generated refcards about the source
4af5981dc75c96e34a27922001106df05ee19e69
Glenn Morris
Thu Nov 17 23:24:03 2016 -0800
2017-01-26 00:39:16 -05:00