From 09e3b593d3f8c257172420e595e590f7b07ba0b0 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sat, 10 Dec 2022 01:51:46 -0500 Subject: orgmode-backports.org: Prune repeated entries The Emacs repo often has a master branch running alongside an emacs-NN branch. Once an emacs-NN commit is included in master via a merge, org-maint-check-for-new will report the commit as new for master (as expected). My approach has been to repeat the entry for both the master and emacs-NN headings, but that's unnecessary noise and could lead to confusion if anyone is searching for a commit. Prune previous duplicate entries, deleting the one that (at the time) would have been under the master heading. An upcoming change to org-maint.el will add support for an exclude-ref property so that these emacs-NN entries can be excluded automatically. --- orgmode-backports.org | 759 ++------------------------------------------------ 1 file changed, 16 insertions(+), 743 deletions(-) diff --git a/orgmode-backports.org b/orgmode-backports.org index 578be8d..250b431 100644 --- a/orgmode-backports.org +++ b/orgmode-backports.org @@ -54,64 +54,16 @@ After resolving the conflict, run NOTE: Look for "ONSYNC" for changes that should be considered when syncing, but that don't seem appropriate for Org backport. -** master branch [9/9] +** master branch [1/1] :PROPERTIES: :ref: origin/master :END: - [X] 26267040549da6e7f8223bea3b5344d0d5bef527 - ; Normalize GPLv3 license statements in new files - Stefan Kangas - Fri Dec 9 00:13:00 2022 +0100 - -- [X] 8fb2afe051168b2eac2bba0ee102039d0af90a05 - - ; Fix typos - Stefan Kangas - Thu Dec 8 07:17:47 2022 +0100 - -- [X] 70ecdebc92c879af90f2d25a2b751d1cc4f3f80d - - ; Fix typos (don't abbreviate "with" or "without") - Stefan Kangas - Thu Dec 1 16:36:09 2022 +0100 + emacs-29 marker -- [X] 8b3baadf671b7b3d5058808c4655eca8bd46015e - - Fix compilation of Org 9.6 on MS-Windows - Eli Zaretskii - Thu Dec 1 14:40:47 2022 +0200 - -- [X] 4b2f5425d7af1a6f992ad8ce0a4452a2e778815a - - Fix types in various defcustom declarations - Mattias Engdegård - Thu Dec 1 13:03:19 2022 +0100 - -- [X] 8617edfffd07eb80561b4de6a37c5b0b5f442e07 - - ; Fix typos - Stefan Kangas - Wed Nov 30 16:59:41 2022 +0100 - -- [X] c3466099c5f44c52ec73a1bbbb2b42de6f29ac7f - - Org regexp style fixes - Mattias Engdegård - Wed Nov 30 13:23:38 2022 +0100 - -- [X] 0625651e8a61c9effc31ff771f15885a3a37c6e6 - - Update to Org 9.6-3-ga4d38e - Kyle Meyer - Tue Nov 29 23:05:53 2022 -0500 - -- [X] beaa2e49530b8149d2c22cb5fa15b8d48f7937b6 - - dummy marker for emacs-29 split - -** emacs-29 [145/145] +** emacs-29 [100/100] :PROPERTIES: :ref: origin/emacs-29 :END: @@ -260,36 +212,18 @@ syncing, but that don't seem appropriate for Org backport. Stefan Kangas Wed Sep 21 10:25:06 2022 +0200 -- [X] 616dcf27e57388403d4c28d441bf7310bb665241 - - ; Fix typos in Lisp symbols - Stefan Kangas - Tue Sep 20 12:21:40 2022 +0200 - - [X] 6e4f6e97bf13f096f6e1a300c67b3489e8000a0f Merge from origin/emacs-28 Stefan Kangas Fri Sep 16 16:27:37 2022 +0200 -- [X] 19de241a7dc193c0d0423019824627adb28f8944 - - Recommend NonGNU ELPA over MELPA - Stefan Kangas - Fri Sep 16 14:04:27 2022 +0200 - - [X] 5c8b76fc873676457810817958c119542ffe16f6 Merge from origin/emacs-28 Stefan Kangas Mon Sep 5 06:30:32 2022 +0200 -- [X] 5713c730f201675918544dbe40ad308c5d0463c3 - - Update to Org 9.5.5 - Kyle Meyer - Sat Sep 3 21:32:20 2022 -0400 - - [X] b7e867b841f47dcff3aeaef9b5608a237386ce70 Make point-at-eol and point-at-bol obsolete @@ -308,12 +242,6 @@ syncing, but that don't seem appropriate for Org backport. Stefan Kangas Mon Aug 22 06:30:29 2022 +0200 -- [X] 582ea6a1e9f98c124a7b044f1db7d4c63da5646d - - Update to Org 9.5.4-19-g4dff42 - Kyle Meyer - Sun Aug 21 17:35:35 2022 -0400 - - [X] 48aacbf292fbe8d4be7761f83bf87de93497df27 Make many seldom-used generalized variables obsolete @@ -380,12 +308,6 @@ syncing, but that don't seem appropriate for Org backport. Stefan Kangas Mon Jul 25 06:30:18 2022 +0200 -- [X] ba70d0f77c52d471bceb2ad2cc7bc172db348abb - - Update to Org 9.5.4-17-g6e991f - Kyle Meyer - Sun Jul 24 16:24:24 2022 -0400 - - [X] 563bf2fae5ec238172f1f16c81e51b9aadd77017 ; * lisp/org/ol.el (org-link--decode-compound): `lsh` -> `ash` @@ -398,12 +320,6 @@ syncing, but that don't seem appropriate for Org backport. Stefan Kangas Sun Jul 17 06:30:41 2022 +0200 -- [X] 10b69198708105655c49b62ac7d6185abb7e02a7 - - ; Fix typos - Stefan Kangas - Sat Jul 16 10:07:38 2022 +0200 - - [X] 2a05479c221d4a13b15ed731e4eb1c0de99e97ed ; Fix typos: prefer American spelling @@ -416,12 +332,6 @@ syncing, but that don't seem appropriate for Org backport. Stefan Kangas Thu Jul 14 11:37:42 2022 +0200 -- [X] ba0871bef1e7d321f1124a6ad20e9be158a976dd - - ; Fix typos: prefer American spelling - Stefan Kangas - Wed Jul 13 13:04:22 2022 +0200 - - [X] 2a8d083607e7e0fe9358f1f6526dbd8aa928af61 Drop support for the dead third-party w3 package @@ -440,24 +350,12 @@ syncing, but that don't seem appropriate for Org backport. Stefan Kangas Mon Jun 27 06:30:25 2022 +0200 -- [X] 48bda83d3591d33c5bb8292d9edb06ef3c3f93bd - - Update to Org 9.5.4-3-g6dc785 - Kyle Meyer - Sun Jun 26 23:00:38 2022 -0400 - - [X] fc46552dc8273e41e40b395b554eb0e3cfa386b9 Merge from origin/emacs-28 Stefan Kangas Sat Jun 25 06:30:26 2022 +0200 -- [X] 1f6750b53a872a5747dff92b8f61cfede0c5a6a6 - - Avoid treating number as an enum in the org manual - Stefan Kangas - Fri Jun 24 19:18:50 2022 +0200 - - [X] f94e93a6eec92d834a6b545d8d4b68280b0993b0 org-cite-list-citations: Cache footnote-definition searches @@ -544,24 +442,12 @@ syncing, but that don't seem appropriate for Org backport. Stefan Kangas Fri Jun 10 08:17:35 2022 +0200 -- [X] 9a4862a9738c2abab8fb4fb2e4e57b69dea679d7 - - * doc/misc/org.org: Remove spurious markup. - Stefan Kangas - Wed Jun 8 13:16:32 2022 +0200 - - [X] d46e94f23fbbd522f2a017444b29f9f18203b4bc Merge from origin/emacs-28 Stefan Kangas Sun Jun 5 06:30:25 2022 +0200 -- [X] 1b8719835a200a2be17da226e82030f691caba80 - - Update to Org 9.5.4 - Kyle Meyer - Sat Jun 4 16:21:06 2022 -0400 - - [X] b2bce107b15d6e0c2b773704179c6bf463525459 Further audits of single quotes in Lisp doc strings @@ -577,12 +463,6 @@ syncing, but that don't seem appropriate for Org backport. Stefan Kangas Mon May 16 06:30:38 2022 +0200 -- [X] f928330fa86e1493d2862180b132a99022458c96 - - Update to Org 9.5.3-6-gef41f3 - Kyle Meyer - Sun May 15 17:49:34 2022 -0400 - - [X] 253374f81a13109b73afc8e319ca1fea72f68c72 Remove some XEmacs compat code from org-mode @@ -619,12 +499,6 @@ syncing, but that don't seem appropriate for Org backport. Paul Eggert Wed Apr 27 00:30:25 2022 -0700 -- [X] 7c1fc2348918a1ad8c61c7519a51042d48d7aa8d - - Update to Org 9.5.3-3-gd54104 - Kyle Meyer - Sun Apr 24 21:07:40 2022 -0400 - - [X] 2d71fd3b041506c68b5f1cd1e409e09e25778c34 Further doc string quoting fixes @@ -649,12 +523,6 @@ syncing, but that don't seem appropriate for Org backport. Paul Eggert Sun Apr 17 13:10:19 2022 -0700 -- [X] 65c04e7115f329a083a16a364a8400e1685def61 - - Update to Org 9.5.2-38-g682ccd - Kyle Meyer - Sun Apr 17 15:30:39 2022 -0400 - - [X] 8ef37913d3be5ff518018acb6b0144d6e559b5ba Port Org encode-time usage back to Emacs 25 @@ -667,60 +535,30 @@ syncing, but that don't seem appropriate for Org backport. Stefan Kangas Mon Mar 21 06:30:40 2022 +0100 -- [X] f15922a57cd6177c9c945d3390a6b9918883415d - - Update to Org 9.5.2-25-gaf6f12 - Kyle Meyer - Sun Mar 20 21:31:32 2022 -0400 - - [X] 8b66adfe065e0f21ec99c88e3cbb1cb16a94c6cd Merge from origin/emacs-28 Stefan Kangas Mon Mar 7 06:33:56 2022 +0100 -- [X] cd77fd3b85f50b75d3fe24713a1ca4f622c110dd - - Update to Org 9.5.2-24-g668205 - Kyle Meyer - Sun Mar 6 20:18:26 2022 -0500 - - [X] 1de7382b574ff9f40319d7a075d952cb944f96ca Merge from origin/emacs-28 Stefan Kangas Mon Feb 28 06:33:06 2022 +0100 -- [X] e77fc8262ad73f30b1983f403262dce6f0e4cb09 - - Update to Org 9.5.2-22-g33543d - Kyle Meyer - Mon Feb 28 00:11:01 2022 -0500 - - [X] bee54495e92ddf5d75e3f68ac7e823b221306719 Merge from origin/emacs-28 Stefan Kangas Tue Feb 22 06:30:59 2022 +0100 -- [X] b7a651ba3787ab8257e35f93f754c4455fc8dba4 - - Update to Org 9.5.2-17-gea6b74 - Kyle Meyer - Sun Feb 20 14:04:28 2022 -0500 - - [X] 2ed240296c181cc677caeef1ec33befd8428aa98 Merge from origin/emacs-28 Eli Zaretskii Fri Feb 18 10:38:49 2022 +0200 -- [X] df3492934639628f023049e032421b7beb80de57 - - Update to Org 9.5.2-15-gc5ceb6 - Kyle Meyer - Sun Feb 13 12:43:54 2022 -0500 - - [X] d52c929e31f60ff0462371bfe27ebd479e3e82bd (with-demoted-errors): Warn on missing `format` arg @@ -736,48 +574,24 @@ syncing, but that don't seem appropriate for Org backport. Stefan Kangas Mon Jan 31 06:58:23 2022 +0100 -- [X] 6f282b31ad7548ab744565144e0d30dd56774210 - - Update to Org 9.5.2-13-gdd6486 - Kyle Meyer - Sun Jan 30 20:38:01 2022 -0500 - - [X] 19d681d24bce0bcff1417c73035d1f9e34fbcc4a Merge from origin/emacs-28 Stefan Kangas Sun Jan 16 06:51:09 2022 +0100 -- [X] e488601849627c53b1638fbab1d115518e0ee794 - - Update to Org 9.5.2-9-g7ba24c - Kyle Meyer - Sat Jan 15 16:02:26 2022 -0500 - - [X] ad125a99273c7bd81d02d388af3c69125dfe27ee Merge from origin/emacs-28 Stefan Kangas Sun Jan 2 06:31:44 2022 +0100 -- [X] f475c5823a409356721e49577116521467680ff4 - - ; Copyright year fixes - Glenn Morris - Sat Jan 1 10:02:17 2022 -0800 - - [X] dcd76bd48df678d8234b904d7b13c997228519a3 Merge from origin/emacs-28 Eli Zaretskii Sat Jan 1 07:03:03 2022 -0500 -- [X] 19dcb237b5b02b36580294ab309124f346a66024 - - ; Add 2022 to copyright years. - Eli Zaretskii - Sat Jan 1 02:45:51 2022 -0500 - - [X] 18b680cfd177e877991be2bd70ead628bbdc0aa0 Fix bug#52467 by adding a new custom variable 'display-comint-buffer-action' @@ -793,12 +607,6 @@ syncing, but that don't seem appropriate for Org backport. Stefan Kangas Mon Dec 27 06:32:28 2021 +0100 -- [X] d4e2850b323fdce7b4d658ece50f6071432deae8 - - Update to Org 9.5.2-3-geb9f34 - Kyle Meyer - Sun Dec 26 16:37:26 2021 -0500 - - [X] 5f57b41aa612e5f190f5a3c1ea013be114493a03 ; Minor license statement fixes @@ -811,12 +619,6 @@ syncing, but that don't seem appropriate for Org backport. Stefan Kangas Sun Dec 19 14:02:30 2021 +0100 -- [X] 5f25852e91f167f99988fbe8d1944fe92d70b903 - - Update to Org 9.5.1-31-ga18849 - Kyle Meyer - Sat Dec 18 13:50:40 2021 -0500 - - [X] e0ca8f791c2e4396f1e40d86c136ae547b40185d Prefer format-time-string to current-time-zone @@ -835,24 +637,12 @@ syncing, but that don't seem appropriate for Org backport. Stefan Kangas Sun Dec 12 06:31:07 2021 +0100 -- [X] 30dd5c9acc3b3b95ef784549b5e3ff8136a23854 - - Update to Org 9.5.1-25-g9ca3bc - Kyle Meyer - Sat Dec 11 12:31:13 2021 -0500 - - [X] d601fd4692e0be3c9ee9b247c8a7bc5b2499f0eb Merge from origin/emacs-28 Stefan Kangas Fri Dec 10 06:30:33 2021 +0100 -- [X] 26fb4168b884eeb910580c42e87efb73399019c9 - - ; Prefer HTTPS in more URLs - Stefan Kangas - Thu Dec 9 16:26:04 2021 +0100 - - [X] c1145c31adf143460911dd87b408d35ea88a1a92 Update org-compat doc string @@ -865,66 +655,30 @@ syncing, but that don't seem appropriate for Org backport. Stefan Kangas Sun Dec 5 06:30:35 2021 +0100 -- [X] c086358574e3671787394c7b9f6069760e7c6b3c - - Update to Org 9.5.1-15-gdb4805 - Kyle Meyer - Sat Dec 4 21:27:59 2021 -0500 - - [X] fa2e812894b999eba8afc4b146ca5e70fa9bd1c8 Merge from origin/emacs-28 Stefan Kangas Thu Dec 2 17:34:10 2021 +0100 -- [X] 50b40e1d4f0063ac78a53673736a2eaa3ba3287b - - ; * lisp/org/ob-julia.el: Fix Author header for authors.el. - Stefan Kangas - Wed Dec 1 17:03:52 2021 +0100 - - [X] f5498a608fe85b66a4068a5ccf88c9b3d3b88f98 Merge from origin/emacs-28 Stefan Kangas Sun Nov 28 14:59:44 2021 +0100 -- [X] 1fffe9a210d328559da2af8facbb75286a31c74e - - ; * lisp/org/org.el: Fix version header. - Stefan Kangas - Sun Nov 28 14:54:24 2021 +0100 - -- [X] b8b2dd17c57b73357cae229e010138fd2352a46f - - Update to Org 9.5.1-11-g96d91b - Kyle Meyer - Sat Nov 27 16:25:09 2021 -0500 - - [X] 1de6a86553c15905066a93e5b761e1825f23015a Merge from origin/emacs-28 Stefan Kangas Sun Nov 21 11:18:23 2021 +0100 -- [X] 0dd3883defc04ea02d2f77d79debf4e18157500d - - Update to Org 9.5-72-gc5d6656 - Kyle Meyer - Sat Nov 20 13:12:18 2021 -0500 - - [X] b4c6ab8cb67be4d5b3e0041981968c6cce4afe89 Merge from origin/emacs-28 Stefan Kangas Sat Nov 13 07:00:30 2021 +0100 -- [X] 42d4e24ff3f13ccbd401d93d70ecdee99b88a26d - - ; Fix typos - Stefan Kangas - Fri Nov 12 13:59:58 2021 +0100 - - [X] 104e90d93664892ed1a7a1631c5b0141d0552a60 Prefer locate-user-emacs-file @@ -937,113 +691,41 @@ syncing, but that don't seem appropriate for Org backport. Michael Albinus Sun Nov 7 18:06:24 2021 +0100 -- [X] f05b8a939b7ad57e9526510d510ff24484dcb520 - - Update to Org 9.5-68-g77e2ec - Kyle Meyer - Sat Nov 6 14:10:47 2021 -0400 - - [X] 0abf01402b4c1959b363ae1c7085fd356fb102a4 Merge from origin/emacs-28 Eli Zaretskii Sun Oct 31 18:46:29 2021 +0200 -- [X] f1c9286376d570e898d349200412021fd67e13d2 - - ; * doc/misc/org.org: fix capture context example - Hanno Perrey - Sun Oct 31 16:23:41 2021 +0100 - - [X] b931e11a03fdb44e378133b10f312e38b1b3d712 Merge from origin/emacs-28 Glenn Morris Sun Oct 24 01:55:45 2021 -0700 -- [X] 6fa520677095c5872f1d448f6f1001ee22e42276 - - Update to Org 9.5-59-g52e6f1 - Kyle Meyer - Sat Oct 23 13:46:59 2021 -0400 - - [X] 7d12c06725d733f1ea223f5fe55d506c71e44370 Merge from origin/emacs-28 Glenn Morris Mon Oct 18 07:50:26 2021 -0700 -- [X] ac6ac76e3ae5ca96607ac7eba4a3ccf146fc8815 - - Update to Org 9.5-57-g9bc3a2 - Kyle Meyer - Sat Oct 16 14:01:34 2021 -0400 - - [X] 8aceb37b47a8f97fc42caaaf021ac06dc9f67827 Merge from origin/emacs-28 Glenn Morris Mon Oct 11 08:04:57 2021 -0700 -- [X] bcce93f04c2df6a5bb5dd1a8e611de734d24aee7 - - Update to Org 9.5-46-gb71474 - Kyle Meyer - Sat Oct 9 16:34:12 2021 -0400 - - [X] 66409422214a0a90e1d2a12ef2c4ebf86f2c01a9 Use format-prompt for many more prompts Stefan Kangas Tue Oct 5 03:44:56 2021 +0200 -- [X] bb209cd5ab819c72784de7278092705e59ff41d5 - - Update to Org 9.5-30-g10dc9d - Kyle Meyer - Sat Oct 2 14:41:27 2021 -0400 - -- [X] 4341e79a5fad3e5e668a3eeb1b688d1986011481 - - Remove bogus ":safe t" custom properties - Glenn Morris - Sat Oct 2 11:00:23 2021 -0700 - -- [X] 62d6cecfcd1a67e15a436c5c2b975f327d9a8b50 - - Remove bogus ":safe nil" custom properties - Glenn Morris - Sat Oct 2 10:46:29 2021 -0700 - -- [X] f9111d8784bf12263abbe127cdfcbe5f409c9b3b - - The safe-local-variable property is a function (bug#50944) - Glenn Morris - Sat Oct 2 10:37:42 2021 -0700 - -- [X] bd60fca2faa03034e89df68a69255656df6512ba - - Fix ox-koma-letter compilation warnings - Lars Ingebrigtsen - Sat Oct 2 10:37:55 2021 +0200 - -- [X] d505971894d83e04e8d206be1dcee1cee5e8bb93 - - ; Standardize some license headers - Glenn Morris - Fri Oct 1 18:07:45 2021 -0700 - -- [X] f1f57a541e4c74eec68a27c47c7416ed6c7d75dd - - Fix some custom types - Glenn Morris - Fri Oct 1 08:33:32 2021 -0700 - - [X] bd3a1c3134a130ca8edf4c13c44a8c2323ef2c90 dummy marker for emacs-28 split -** emacs-28 [139/139] +** emacs-28 [125/125] :PROPERTIES: :ref: origin/emacs-28 :END: @@ -1418,12 +1100,6 @@ syncing, but that don't seem appropriate for Org backport. Amin Bandali Sun Jul 4 00:14:47 2021 -0400 -- [X] 348b2aed0c8c3630be4c15c8e70acf7ea9c023af - - Update IRC-related references to point to Libera.Chat - Amin Bandali - Sat Jul 3 23:39:18 2021 -0400 - - [X] 19f2f2699499d87186c6f580e4ec79205d59c096 Prevent Org mode from mistakenly changing Calendar keymap @@ -1602,18 +1278,6 @@ syncing, but that don't seem appropriate for Org backport. Glenn Morris Fri Dec 25 10:36:48 2020 -0800 -- [X] b242bbb073b501f7a4d4569c2d70cde522abbea3 - - ; lisp/org/org.el: Fix Version header. - Glenn Morris - Fri Dec 25 10:36:25 2020 -0800 - -- [X] 7f8793e5f1c69cf9311479e69d18a62ae87e35ce - - Update to Org 9.4.4 - Bastien Guerry - Tue Dec 22 10:29:37 2020 +0100 - - [X] 34a73666d9559d948815a53b63dc36cc878d5aff Shorten some over-wide docstrings in functions and macros @@ -1662,30 +1326,12 @@ syncing, but that don't seem appropriate for Org backport. https://orgmode.org/list/87o8i2cpb2.fsf@gmail.com -- [X] 7cacf5da47d1f88bbaef07e10841d1f6bfe2e471 - - Update to Org 9.4.3 - Bastien Guerry - Wed Dec 16 19:17:58 2020 +0100 - - [X] cbdd48a07be5401177807ed6e6b8ec16c1b5e004 Merge from origin/emacs-27 Glenn Morris Tue Dec 15 09:24:21 2020 -0800 -- [X] 2dbc95063b5ee3d48aceff05f89e63a134df86ed - - Update to Org 9.4.2 - Bastien Guerry - Sun Dec 13 22:26:51 2020 +0100 - -- [X] f22856a5c54d99867cd24c08a14bbda23d5c6229 - - Update to Org 9.4.1 - Bastien Guerry - Sun Dec 13 13:44:15 2020 +0100 - - [X] 0a4aa2894297c0fd9e735328bbb60b427e0ba5d4 Remove redundant requires of 'font-lock' @@ -1757,12 +1403,6 @@ syncing, but that don't seem appropriate for Org backport. Glenn Morris Fri Oct 2 09:38:24 2020 -0700 -- [X] 78eacf31e8fe182801ad1943fac717b75fcf286b - - ; Fix many typos in symbols in docs and comments - Stefan Kangas - Fri Oct 2 13:29:45 2020 +0200 - - [X] c6fa0ad315e38167cb81a4d8c143cc53ad783cc3 ; Prefer https to http in many URLs @@ -1817,12 +1457,6 @@ syncing, but that don't seem appropriate for Org backport. Glenn Morris Wed Apr 15 07:50:15 2020 -0700 -- [X] 4acdd7fe58ae9f94102afeca67b0383141d597da - - Fix edge case errors in filename-matching regexps - Mattias Engdegård - Tue Apr 14 12:25:16 2020 +0200 - - [X] 22524a6e39582d44c1365bad9a589618c2b0df27 Fix mistake in regexp cleanup @@ -1849,30 +1483,12 @@ syncing, but that don't seem appropriate for Org backport. Glenn Morris Thu Feb 13 07:50:24 2020 -0800 -- [X] 0304f530761bee1c217bbf8fe7839cdfe8767a51 - - doc/misc/org.texi: Fix @dircategory - Bastien - Thu Feb 13 09:41:38 2020 +0100 - -- [X] 530067463bffc982f02dcc4f2805d389704575b4 - - Correct "different than" to "different from" where appropriate - Alan Mackenzie - Sun Feb 9 14:33:14 2020 +0000 - - [X] 68d43392a65186a944c839dc576b2b01deafbb0d Merge from origin/emacs-27 Glenn Morris Thu Feb 6 07:50:29 2020 -0800 -- [X] 32763dac46e61cc34e8fe4d19df4905d09c1a27f - - Replace add-to-list to lexical variable with push (bug#39373) - Mattias Engdegård - Sat Feb 1 22:27:23 2020 +0100 - - [X] 0c6c8aa002d321db61afdd14c70744f7bc27f268 Remove (or double) redundant backslashes in string literals @@ -1891,32 +1507,12 @@ syncing, but that don't seem appropriate for Org backport. Paul Eggert Sun Jan 5 11:44:48 2020 -0800 -- [X] f95a2b83014a810d508448473b20186d55485efd - - Fix some broken conditional forms - Paul Eggert - Sat Jan 4 11:18:13 2020 -0800 - - Already fixed by Bastien in 04bd110b2 (Small fixes, 2020-01-31). - - [X] c6fb86b40bebf597fccbe4eba58ceea83bd9700f Merge from origin/emacs-27 Paul Eggert Wed Jan 1 01:08:16 2020 +0000 -- [X] 4cd143aded5e40fe801575c669dd464210caaf7e - - Fix copyright years by hand - Paul Eggert - Wed Jan 1 01:01:53 2020 +0000 - -- [X] 365e01cc9f64ce6ca947ccfd8612d60763280a37 - - Update copyright year to 2020 - Paul Eggert - Wed Jan 1 00:59:52 2020 +0000 - - [X] af085ef40b961ca3466e8b2dfb7f722573e5a4cc Use regexp type for regexps in defcustom declarations @@ -1925,7 +1521,7 @@ syncing, but that don't seem appropriate for Org backport. - [X] b0f20651e3cbb8a66f11ffae4c18634019c20cd4 -** emacs 27 branch [197/197] +** emacs 27 branch [146/146] :PROPERTIES: :ref: origin/emacs-27 :END: @@ -2026,6 +1622,8 @@ syncing, but that don't seem appropriate for Org backport. Paul Eggert Sat Jan 4 11:18:13 2020 -0800 + Already fixed by Bastien in 04bd110b2 (Small fixes, 2020-01-31). + Reverted by above commit. - [X] 4cd143aded5e40fe801575c669dd464210caaf7e @@ -2281,14 +1879,6 @@ syncing, but that don't seem appropriate for Org backport. Paul Eggert Sun May 26 01:00:15 2019 -0700 -- [X] 7681a57b88a91bf9eedc890b974df9728d5eb50d - - Remove redundants "See" before @xref or @pxref (Bug#35793) - Mauro Aranda - Sat May 25 13:02:05 2019 -0400 - - same note as above for emacs26 - - [X] 5424436452bc0b3d8a62a8398f92d0c2db81e22b Avoid backslash-newline-newline in source code @@ -2370,12 +1960,6 @@ syncing, but that don't seem appropriate for Org backport. 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 @@ -2396,18 +1980,6 @@ syncing, but that don't seem appropriate for Org backport. 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 @@ -2447,24 +2019,12 @@ syncing, but that don't seem appropriate for Org backport. 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 @@ -2497,12 +2057,6 @@ syncing, but that don't seem appropriate for Org backport. 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 @@ -2527,12 +2081,6 @@ syncing, but that don't seem appropriate for Org backport. 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 @@ -2556,24 +2104,6 @@ syncing, but that don't seem appropriate for Org backport. 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 @@ -2586,15 +2116,9 @@ syncing, but that don't seem appropriate for Org backport. - [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 + Merge from origin/emacs-26 + Stefan Monnier + Fri Mar 23 11:01:31 2018 -0400 - [X] 1c7db8aa30969d0bc0e6d35b9bd57c70314ed9d0 @@ -2614,12 +2138,6 @@ syncing, but that don't seem appropriate for Org backport. 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 @@ -2632,12 +2150,6 @@ syncing, but that don't seem appropriate for Org backport. 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 @@ -2650,30 +2162,6 @@ syncing, but that don't seem appropriate for Org backport. 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 @@ -2686,63 +2174,24 @@ syncing, but that don't seem appropriate for Org backport. 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) : Set default to true @@ -2759,28 +2208,6 @@ syncing, but that don't seem appropriate for Org backport. 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 @@ -2793,24 +2220,12 @@ syncing, but that don't seem appropriate for Org backport. 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 @@ -2827,106 +2242,6 @@ syncing, but that don't seem appropriate for Org backport. 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] 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 - - [X] cdef84fb6893f69ffee1a99fe82a262e02e59bf5 Spelling fixes @@ -3059,14 +2374,6 @@ syncing, but that don't seem appropriate for Org backport. 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) @@ -3108,14 +2415,6 @@ syncing, but that don't seem appropriate for Org backport. 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 @@ -3146,20 +2445,6 @@ syncing, but that don't seem appropriate for Org backport. 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 @@ -3186,14 +2471,6 @@ syncing, but that don't seem appropriate for Org backport. 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' @@ -3219,14 +2496,6 @@ syncing, but that don't seem appropriate for Org backport. 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’ @@ -3416,8 +2685,9 @@ syncing, but that don't seem appropriate for Org backport. Glenn Morris Fri Feb 2 21:09:09 2018 -0500 - Guess Nicolas paritally backported in - fffd300efdfa21211c99955b3f9bbc7a1d23e5f8. + Nicolas has applied the header part in + fffd300efdfa21211c99955b3f9bbc7a1d23e5f8. I have a to-do for trying + to sync tests. - [X] 7d90d2ece041630e0c440a2b0216e43f82729844 @@ -3591,6 +2861,9 @@ syncing, but that don't seem appropriate for Org backport. Noam Postavsky Sun Jan 29 11:01:32 2017 -0500 + Already taken care of by 0ccd8286a (org-src: Fix fontification + error, 2017-03-19). + - [X] 2e2a8068031b79a6cc5502b8d4c9d849ebb1dae0 Fix copyright years by hand -- cgit v1.2.3