Re: Releasing Emacs 26.1

[Rasmus <rasmus@gmx.us>]

[-- Attachment #1: Type: text/plain, Size: 3349 bytes --]

Eli Zaretskii <eliz@gnu.org> writes:

>> From: Bastien <bzg@gnu.org>
>> Cc: John Wiegley <johnw@gnu.org>,  emacs-devel@gnu.org, Rasmus Pank Roulund <rasmus@gmx.us>
>
>> Date: Mon, 07 May 2018 07:40:37 +0200
>> 
>> If these four Org bugfixes (9.1.13) can make it, that'd be great:
>> 
>>   064caac ox-html: Make use of :html-preamble/postamble-format
>>   631c4b7 org-src: Clear overlay in Org buffer after major mode change
>>   80eb69b org-list: Proper error message when trying to indent top level item
>>   388254e Revert "org.el: Fix bug when links contain special characters"
>
> The last 2 are okay for the release branch.  The other two I'm not
> comfortable enough to risk, sorry.  (They don't seem ti be critical,
> are they?)

Here’s a full list of the changes not merged, with a detailed changelog
attached.  I am not really sure how to "pick" changes to port.  But as I
wrote in another message, will it be able to add these to a subsequent
minor release (26.1.1, say?)

Rasmus

     064caac93 ox-html: Make use of :html-preamble/postamble-format
     631c4b703 org-src: Clear overlay in Org buffer after major mode change
     80eb69b64 org-list: Proper error message when trying to indent top level item
     388254e0d Revert "org.el: Fix bug when links contain special characters"
     5d0792057 Fix commit f21fb8a
     8b6e5d5f2 Revert "org-agenda.el: Fix bug when getting the warning delay of a deadline"
     6cd224e83 Merge branch 'maint' of code.orgmode.org:bzg/org-mode into maint
     f21fb8ad3 org-agenda.el: Fix bug when getting the warning delay of a deadline
     b1d084c1a org.el: Fix bug when links contain special characters
     407014e06 Fix default directory for git-annex checks
     2742211ec org-agenda.el: Fix bug when keyboard-quitting the match prompt
     8944b578b Remove agenda-archives even with buffer restriction
     e2e549523 Fix "(wrong-number-of-arguments max 0)" with fast tag selection
     4323db60c Fix typo in docstring
     0dc4ba22e org.texi: Document `org-agenda-search-headline-for-time'
     f1b43fe9e Fix multiple tag selection
     d13811cbc Backport commit 8f6293ca7 from Emacs
     cb63ccb78 org-capture: Fix error on capture abort
     c75c574d5 org-capture: Fix error when clipboard is empty
     5792f0687 ox-md: Tiny refactoring
     c6e5aa1da ox-md: Fix ToC on unnumbered headings
     14d3d59c4 Clarify `md' and `html' back-ends relationship
     8c3d4fbde Document `org-timestamp-up' and `org-timestamp-down' behavior
     8814988d1 Fix error message
     8b6a617ff Remove inlinetask END part from Agenda view
     1a1e47198 Fix `org-{w3m|eww}-copy-for-org-mode' on blank links
     1976c02af Fix docstring
     d20fc4d7c org-capture: Properly handle `org-extend-today-until' in templates
     575d66625 org-table: Fix alignment with long links
     f05c2eae3 Fix RET on multi-line links
     8e5d74ca4 ob-sed: Use -f instead of --file to support BSD sed
     befc92b9c org-agenda: Call `recenter' only if buffer has a window
     3e1f111c3 ob-python: Small refactoring
     1966d58b2 ob-python: Insert blank line when sending code to interpreter
     b1a6395df Backport commit 9bff405d0 from Emacs
     7240f9c84 org.texi: Fix typo in capture protocol example
     ab488dc43 org.el: Fix whitespace issue blocking upstream commit


-- 
History is what should never happen again

[-- Attachment #2: changes --]
[-- Type: text/plain, Size: 16209 bytes --]

commit 732aa477b031772c3694023cbf34eec6bdc08d61
Author: Kyle Meyer <kyle@kyleam.com>
Date:   Sun May 6 02:28:09 2018 -0400

    Update version keyword

commit 064caac937acdf3f7993ff459feffaba7bef7d7d
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date:   Fri May 4 00:24:36 2018 +0200

    ox-html: Make use of :html-preamble/postamble-format
    
    * lisp/ox-html.el (org-html--build-pre/postamble): Use
    `:html-preamble-format' and `:html-postamble-format' instead of
    relying on the global variables.
    
    Reported-by: Brady Trainor <mail@bradyt.com>
    <http://lists.gnu.org/r/emacs-orgmode/2018-05/msg00073.html>

commit 631c4b703e78e011481b5d045e0bb552a6143e00
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date:   Wed May 2 23:52:35 2018 +0200

    org-src: Clear overlay in Org buffer after major mode change
    
    * lisp/org-src.el (org-src--allow-write-back):
    (org-src--auto-save-timer):
    (org-src--babel-info):
    (org-src--beg-marker):
    (org-src--block-indentation):
    (org-src--end-marker):
    (org-src--from-org-mode):
    (org-src--overlay):
    (org-src--preserve-indentation):
    (org-src--remote):
    (org-src--saved-temp-window-config):
    (org-src--source-type):
    (org-src--tab-width): Define as local and permanent variable.
    
    (org-src--edit-element):
    (org-edit-src-code):
    (org-edit-inline-src-code): Use `setq' instead of `setq-local'.
    
    When major mode is changed in an edit buffer, the variables above
    would be cleared and the overlay in the source buffer could not be
    removed anymore.

commit 80eb69b6484aee61779aeb6ad59efca939b7a460
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date:   Tue May 1 15:02:52 2018 +0200

    org-list: Proper error message when trying to indent top level item
    
    * lisp/org-list.el (org-list-struct-indent): Return proper error
      message upon trying to indent a top-level item.  Use `user-error'.
    * testing/lisp/test-org-list.el (test-org-list/indent-item): Add test.

commit 388254e0d0dcebafa2e2de970da96a2b08179444
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date:   Fri Apr 27 17:12:18 2018 +0200

    Revert "org.el: Fix bug when links contain special characters"
    
    This reverts commit b1d084c1ab877a58b342ae4a8b8d844b9b54e625.
    
    The fix introduces a bug where `org-edit-special' throws an error on
    INCLUDE keywords.

commit e8c40b7a07a4a861d4dac77427cf0f8809824a80
Author: Bastien <bzg@gnu.org>
Date:   Fri Apr 27 12:31:13 2018 +0200

    org.el: Update version keyword to 9.1.12
    
    Thanks to Nicolas for reminding me.

commit 5d0792057dea013e9980e3e10de2806c5751c4b3
Author: Bastien <bzg@gnu.org>
Date:   Fri Apr 27 03:17:12 2018 +0200

    Fix commit f21fb8a

commit 8b6e5d5f2e06231798a1a29c61243ac3f796f001
Author: Bastien <bzg@gnu.org>
Date:   Fri Apr 27 03:09:28 2018 +0200

    Revert "org-agenda.el: Fix bug when getting the warning delay of a deadline"
    
    This reverts commit f21fb8ad3b47409d5f86dbcff7c5d420c8503fbf.

commit 6cd224e83341d2a6791249b7c3230e2456522a5a
Merge: f21fb8ad3 e2e549523
Author: Bastien <bzg@gnu.org>
Date:   Fri Apr 27 01:27:15 2018 +0200

    Merge branch 'maint' of code.orgmode.org:bzg/org-mode into maint

commit f21fb8ad3b47409d5f86dbcff7c5d420c8503fbf
Author: Bastien <bzg@gnu.org>
Date:   Thu Apr 26 22:59:36 2018 +0200

    org-agenda.el: Fix bug when getting the warning delay of a deadline
    
    * lisp/org-agenda.el (org-agenda-get-deadlines): Fix bug when
    getting the warning delay of a deadline.
    
    Thanks to Alex Branham for reporting this.

commit b1d084c1ab877a58b342ae4a8b8d844b9b54e625
Author: Bastien <bzg@gnu.org>
Date:   Thu Apr 26 21:52:39 2018 +0200

    org.el: Fix bug when links contain special characters
    
    * lisp/org.el (org-open-link-from-string): Fix bug when links
    contain special characters.
    
    Thanks to Joon Ro for reporting this.

commit 407014e0684796862a1b1d707717f4fdbdccc7da
Author: Matt Lundin <mdl@imapmail.org>
Date:   Sun Mar 25 22:11:09 2018 -0500

    Fix default directory for git-annex checks
    
    * lisp/org-attach.el: (org-attach-annex-get-maybe) Ensure shell
      command that checks whether a git-annex file exists is called from
      within the git-annex repository. Otherwise, it will result in an
      error.

commit 2742211ec69eebe5de8539b1825cf0049adc0d46
Author: Bastien <bzg@gnu.org>
Date:   Thu Apr 26 18:44:58 2018 +0200

    org-agenda.el: Fix bug when keyboard-quitting the match prompt
    
    * lisp/org-agenda.el (org-tags-view): Don't leave an empty
    *Org agenda* buffer when keyboard-quitting the match prompt.
    
    Thanks to Xu Chunyang for reporting this.

commit 8944b578b86dd3c16e568e905b43e5fa6cfa5e68
Author: Allen Li <darkfeline@felesatra.moe>
Date:   Sat Dec 30 03:41:51 2017 -0800

    Remove agenda-archives even with buffer restriction
    
    * lisp/org-agenda.el (org-search-view): Remove agenda-archives even
      with buffer restriction.

commit e2e5495239833034c27de6f21c496fa1b05f5d85
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date:   Thu Apr 26 14:16:17 2018 +0200

    Fix "(wrong-number-of-arguments max 0)" with fast tag selection
    
    * lisp/org.el (org-fast-tag-selection): Fix
      "(wrong-number-of-arguments max 0)" error when setting tag and no
      tag is defined.

commit fd4ade40ed3ce135495796401296d318f2475352
Author: Martin Kampas <martin.kampas@ubedi.net>
Date:   Mon Apr 23 19:27:18 2018 +0200

    org-collector.el: Inhibit lisp evaluation of headlines
    
    * contrib/lisp/org-collector.el (org-propview-collect): Inhibit lisp
      evaluation of headlines
    
    This fixes org-collector usage for items starting with a hyperlink,
    which would be incorrectly treated as lisp code.

commit 4323db60c5786d708f7dac69a257c0340b372500
Author: Bastien <bzg@gnu.org>
Date:   Thu Apr 26 09:56:45 2018 +0200

    Fix typo in docstring
    
    * lisp/org-eww.el (org-eww-copy-for-org-mode): Fix typo in docstring.
    
    Thanks to Xu Chunyang <mail@xuchunyang.me> for reporting this.

commit 0dc4ba22e27c3747cf8c097f53703b0785a9b222
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date:   Tue Apr 24 23:20:53 2018 +0200

    org.texi: Document `org-agenda-search-headline-for-time'
    
    * doc/org.texi (Time-of-day specifications): Document
      `org-agenda-search-headline-for-time'.
    
    Reported-by: Rohit Patnaik <quanticle@quanticle.net>
    <http://lists.gnu.org/r/emacs-orgmode/2018-04/msg00405.html>

commit f1b43fe9e65e33a0f734932b043e83fc2bfba583
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date:   Mon Apr 23 15:24:23 2018 +0200

    Fix multiple tag selection
    
    * lisp/org.el (org--tag-add-to-alist): Preserve order when merging tag
      alists.  Remove duplicates only when they are outside a group.
      Rename from `org-tag-add-to-alist'.
    (org-set-regexps-and-options):
    (org-global-tags-completion-table):
    (org-make-tags-matcher):
    (org-set-tags):
    (org-change-tag-in-region):
    (org-agenda-prepare-buffers): Apply renaming.
    
    Reported-by: Alex Branham <alex.branham@gmail.com>
    <http://lists.gnu.org/r/emacs-orgmode/2018-04/msg00311.html>

commit e3b1c664e7ac23bf55abca8dd551d1cd928bc3a0
Author: Kyle Meyer <kyle@kyleam.com>
Date:   Sun Apr 22 11:09:36 2018 -0400

    Update version keyword

commit d13811cbc05cae1fb1e2288aa96f0becb68f6cc5
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Thu Apr 19 12:21:06 2018 +0300

    Backport commit 8f6293ca7 from Emacs
    
    * doc/org.texi (Editing source code, Export settings)
    (Closing items, Drawers, Structure editing): Fix use of
    @key.  For the details, see
    http://lists.gnu.org/archive/html/emacs-devel/2018-04/msg00390.html.
    
    Fix use of @key in Texinfo manuals
    8f6293ca789edf06ea8e7b4b80edf7558d590ca7
    Eli Zaretskii
    Thu Apr 19 12:21:06 2018 +0300

commit cb63ccb78e43428503a1e6c4c877c4771b0cb527
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date:   Sat Apr 21 15:21:25 2018 +0200

    org-capture: Fix error on capture abort
    
    * lisp/org-capture.el (org-capture-finalize): Do not set `abort-note'
      to `dirty' too easily.
    
    Reported-by: Brad Knotwell <bknotwell@yahoo.com>
    <http://lists.gnu.org/r/emacs-orgmode/2018-04/msg00183.html>

commit c75c574d580ca751e28881fcb6acc8a250adec88
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date:   Sat Apr 21 11:25:46 2018 +0200

    org-capture: Fix error when clipboard is empty
    
    * lisp/org-capture.el (org-capture-fill-template): Fix "%x"
      placeholder when clipboard is empty.
    
    Reported-by: Brady Trainor <mail@bradyt.com>
    <http://lists.gnu.org/r/emacs-orgmode/2018-04/msg00328.html>

commit 5792f0687174a23bd5d5b2ab9013ca68520e0457
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date:   Sat Apr 21 11:06:13 2018 +0200

    ox-md: Tiny refactoring
    
    * lisp/ox-md.el (org-md--build-toc): Tiny refactoring.

commit c6e5aa1da877911d8bd69a8a521cd3b1731d9650
Author: Yue Zhu <yuezhu3@gmail.com>
Date:   Fri Apr 20 10:49:44 2018 -0400

    ox-md: Fix ToC on unnumbered headings
    
    (org-md--build-toc): When exporting markdown with ToC, if heading
    numbering is not enabled, ToC will be shown as an unordered list.
    
    TINYCHANGE

commit 14d3d59c44c63e82048e3d6424119f0fe8a64999
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date:   Fri Apr 20 11:11:52 2018 +0200

    Clarify `md' and `html' back-ends relationship
    
    * doc/org.texi (Markdown export): Reword.
    
    Reported-by: "Loris Bennett" <loris.bennett@fu-berlin.de>
    <http://lists.gnu.org/r/emacs-orgmode/2018-04/msg00303.html>

commit 8c3d4fbde7989484aa857451beac72b35a9c987c
Author: Andrew Eggenberger <andrew.eggenberger@gmail.com>
Date:   Mon Apr 16 19:07:41 2018 -0500

    Document `org-timestamp-up' and `org-timestamp-down' behavior
    
    * org.el (org-timestamp-up): Document undocumented behavior.
    (org-timestamp-up): The function changes the timestamp type when
    the point is on the enclosing bracket.  The documentation now
    reflects that behavior.
    
    * org.el (org-timestamp-down): Document undocumented behavior.
    (org-timestamp-down): The function changes the timestamp type when
    the point is on the enclosing bracket.  The documentation now
    reflects that behavior.
    
    TINYCHANGE

commit 8814988d1cdfb1612919f42d6498b8aea326b220
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date:   Wed Apr 18 22:18:23 2018 +0200

    Fix error message
    
    * lisp/org.el (org-kill-line): Fix error message.

commit 8b6a617ff53b5713f2e65bae58eb913672cac5c8
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date:   Mon Apr 16 13:44:52 2018 +0200

    Remove inlinetask END part from Agenda view
    
    * lisp/org-inlinetask.el (org-inlinetask-end-p): New function.
    (org-inlinetask-at-task-p):
    (org-inlinetask-in-task-p):
    (org-inlinetask-goto-beginning):
    (org-inlinetask-goto-end):
    * lisp/org.el (org-scan-tags): Use new function.
    
    Reported-by: Alain.Cochard@unistra.fr
    <http://lists.gnu.org/r/emacs-orgmode/2018-04/msg00235.html>

commit 1a1e47198f685697bd208ad4777cf6b0574c5b36
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date:   Sat Apr 14 19:30:17 2018 +0200

    Fix `org-{w3m|eww}-copy-for-org-mode' on blank links
    
    * lisp/org-w3m.el (org-w3m-copy-for-org-mode):
    * lisp/org-eww.el (org-eww-copy-for-org-mode): Do not error when
      called on blank links.
    
    Reported-by: Bob Newell <bobnewell@bobnewell.net>
    <http://lists.gnu.org/r/emacs-orgmode/2018-04/msg00255.html>

commit 1976c02af0c5bbbc49ec9698ea40871093078a09
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date:   Thu Apr 12 21:45:52 2018 +0200

    Fix docstring
    
    * lisp/org.el (org-file-apps): Fix regexp in docstring.

commit d20fc4d7c5973e2c07feb321f959471d946aff57
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date:   Wed Apr 11 23:01:16 2018 +0200

    org-capture: Properly handle `org-extend-today-until' in templates
    
    * lisp/org-capture.el (org-capture-set-target-location): Handle
      non-default `org-extend-today-until'.
    
    Reported-by: Robert Irelan <rirelan@gmail.com>
    <http://lists.gnu.org/r/emacs-orgmode/2018-04/msg00023.html>

commit b7a7dd1492af2853ead064e8b1cf3094216c2147
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date:   Wed Apr 11 21:42:46 2018 +0200

    Update version keyword

commit 1553aae9948ff8c664d20df04ff3580ecf947a42
Author: Jay Kamat <jaygkamat@gmail.com>
Date:   Mon Apr 9 21:47:58 2018 -0400

    org-notify: Fix an error in `org-notify-process' when unconfigured
    
    * contrib/lisp/org-notify.el (org-notify-todo-list): Return nil if
      `org-agenda-files' is nil.

commit 575d66625d13c34bbeae5f44d24235194cddd478
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date:   Mon Apr 9 21:55:33 2018 +0200

    org-table: Fix alignment with long links
    
    * lisp/org-table.el (org-table-align): Fix alignment with long links.

commit f05c2eae3394afa5d8075ccac38b94163acda9e7
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date:   Sun Apr 8 18:35:40 2018 +0200

    Fix RET on multi-line links
    
    * lisp/org.el (org-return): Follow multi-line links.
    * testing/lisp/test-org.el (test-org/return): Add tests.
    
    Reported-by: Brent Goodrick <bgoodr@gmail.com>
    <http://lists.gnu.org/r/emacs-orgmode/2018-04/msg00105.html>

commit 8e5d74ca4c132af4df2a6d330633809866f202b5
Author: Brad Knotwell <b.knotwell@f5.com>
Date:   Wed Apr 4 13:19:32 2018 +0200

    ob-sed: Use -f instead of --file to support BSD sed
    
    lisp/ob-sed.el (org-babel-execute:sed): Change file flag to "-f"
    instead of "--file" to support BSD sed as well.
    
    Signed-off-by: Bjarte Johansen <bjarte.johansen@gmail.com>

commit befc92b9c0b1837266e42c74c0fb7fc8f878b919
Author: Pierre Téchoueyres <pierre.techoueyres@free.fr>
Date:   Wed Mar 28 01:35:22 2018 +0200

    org-agenda: Call `recenter' only if buffer has a window
    
    * lisp/org-agenda.el (org-agenda-list): Condition the call to
      `recenter` only when the buffer has a window associated.
    
    This permit to call `org-agenda-list` in a `with-temp-buffer` like
    below:
    
    (with-temp-buffer
      (let ((org-agenda-sticky nil)
            (org-agenda-buffer-tmp-name (buffer-name)))
        (org-agenda-list 1)
        (buffer-string))

commit 3e1f111c3b862ebe7394377dd1d2c2b60a261c99
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date:   Tue Apr 3 21:27:59 2018 +0200

    ob-python: Small refactoring
    
    * lisp/ob-python.el (org-babel-python-evaluate-session): Small
      refactoring.

commit 1966d58b253d0077025589c736b9223010682e17
Author: Gong Qijian <gongqijian@gmail.com>
Date:   Sun Apr 1 16:34:32 2018 +0800

    ob-python: Insert blank line when sending code to interpreter
    
    * lisp/ob-python.el (org-bable-python-evaluate-session):
    
    Syntax error occurs when evaluating the following code block:
    
    \#+begin_src python :session
    if True:
        1
    2
    \#+end_src
    
    A blank line is required for top level module code to end an indented block, such as a for loop, try/except, or if statement.
    
    https://www.python.org/dev/peps/pep-0008/#blank-line
    
    TINYCHANGE

commit b1a6395dfeadd9adc5ce7633f341dfbbb30bd39e
Author: Michael Albinus <michael.albinus@gmx.de>
Date:   Wed Mar 28 10:38:26 2018 +0200

    Backport commit 9bff405d0 from Emacs
    
    * doc/org.texi (Installation): Fix clone commands.
    
    9bff405d09f6eeeb577e6e0111e49f35d3b95b52
    Michael Albinus
    Wed Mar 28 10:38:26 2018 +0200

commit 7240f9c84769d92d9c95d1cae1f8c756b8ec74a0
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date:   Wed Mar 28 17:16:57 2018 +0200

    org.texi: Fix typo in capture protocol example
    
    * doc/org.texi (@code{capture} protocol): Add missing protocol.
    
    Reported-by: Буковская Агнесса <aggie@yandex.ru>
    <http://lists.gnu.org/r/emacs-orgmode/2018-03/msg00528.html>

commit ab488dc4383fa313b132988819f738afe314132e
Author: Rasmus <rasmus@gmx.us>
Date:   Tue Mar 27 23:33:35 2018 +0200

    org.el: Fix whitespace issue blocking upstream commit