summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
86 min.Merge branch 'maint'HEADmasterNicolas Goaziou1-9/+5
87 min.ox-man: Fix code and verbatim exportmaintNicolas Goaziou1-9/+5
* lisp/ox-man.el (org-man-code): (org-man-verbatim): Fix functions. Reported-by: Anthony Agelastos <iqgrande@gmail.com> <http://lists.gnu.org/archive/html/emacs-orgmode/2017-10/msg00313.html>
92 min.Merge branch 'maint'Nicolas Goaziou2-2/+8
93 min.Fix `org-insert-todo-heading'Allen Li2-2/+8
* lisp/org.el (org-insert-todo-heading): Insert TODO keyword relative to the original headline, not to the headline above. * testing/lisp/test-org.el (test-org/insert-todo-heading-respect-content): Add test.
25 hoursMerge branch 'maint'Nicolas Goaziou2-11/+22
25 hoursUpdate documentation on org-protocol template placeholdersAllen Li2-11/+22
* doc/org.texi (@code{capture} protocol): Fix placeholder names (Template expansion): Add org-protocol placeholders * lisp/org.el (org-store-link-plist): Fix docstring grammar (org-store-link-props): Fix docstring grammar
38 hoursMove `org-completing-read' into "org-macs.el"Nicolas Goaziou2-20/+25
* lisp/org-macs.el (org-completing-read): Moved here... * lisp/org.el: ... from there.
39 hoursMove `org-xor' into "org-macs.el"Nicolas Goaziou2-4/+8
* lisp/org.el (org-xor): Move... * lisp/org-macs.el: ... there.
3 daysox-texinfo: Handle "notoc" valueNicolas Goaziou1-75/+70
* lisp/ox-texinfo.el (org-texinfo-classes): Introduce @chapheading and al. in default value. (org-texinfo--structuring-command): Remove function. (org-texinfo-headline): Handle unnumbered out of TOC headlines. (org-texinfo-section): Do not add menu in unnumbered headings.
3 daysImplement `org-export-excluded-from-toc-p'Nicolas Goaziou3-0/+38
* lisp/ox.el (org-export-excluded-from-toc-p): New function. * testing/lisp/test-ox.el (test-org-export/excluded-from-toc-p): New test.
3 daysox: Implement "notoc" UNNUMBERED valueNicolas Goaziou4-8/+48
* lisp/ox.el (org-export-collect-headlines): Exclude headlines with UNNUMBERED property set to "notoc". * doc/org.texi (Export settings): (Table of contents): Document new value. * testing/lisp/test-ox.el (test-org-export/collect-headlines): Add test.
4 daysImprove a docstringNicolas Goaziou1-9/+9
* lisp/org-element.el (org-element-lineage): Improve docstring.
4 daysMerge branch 'maint'Nicolas Goaziou1-1/+1
4 daysSilence byte-compilerNicolas Goaziou1-1/+1
4 daysMerge branch 'maint'Nicolas Goaziou7-38/+129
4 daysFix links without contents in table of contents' entriesNicolas Goaziou6-36/+127
* lisp/ox.el (org-export-toc-entry-backend): New function. * lisp/ox-html.el (org-html--format-toc-headline): * lisp/ox-md.el (org-md--build-toc): * lisp/ox-odt.el (org-odt-toc): Use new function. * lisp/ox-texinfo.el (org-texinfo--sanitize-title): (org-texinfo--wrap-float): Handle links without contents. * testing/lisp/test-ox.el (test-org-export/toc-entry-backend): New test. Reported-by: ConcreteVitamin <concretevitamin@gmail.com> <http://lists.gnu.org/archive/html/emacs-orgmode/2017-10/msg00235.html>
5 daysox-koma-letter: Fix typo.Nicolas Goaziou1-2/+2
* contrib/lisp/ox-koma-letter.el (org-koma-letter-template): Fix typo. Reported-by: Alan Schmitt <alan.schmitt@polytechnique.org> <http://lists.gnu.org/archive/html/emacs-orgmode/2017-10/msg00238.html>
5 daysMerge branch 'maint'Nicolas Goaziou1-2/+4
5 days`org-file-contents': Improve error messageNicolas Goaziou1-2/+4
* lisp/org.el (org-file-contents): Improve error message.
5 daysMerge branch 'maint'Kyle Meyer2-2/+2
5 daysBackport commit 5d51403ce from EmacsPaul Eggert1-1/+1
; Typo fixes, mostly repeated words 5d51403ceb9b86a1bfa66f00c7af39f1200e65f1 Paul Eggert Mon Oct 9 22:55:06 2017 -0700
5 daysBackport commit 0d004ed01 from EmacsPaul Eggert1-1/+1
; Spelling fixes 0d004ed01abb5fa025bdc9d58fce2a3abff0b6a4 Paul Eggert Mon Oct 9 22:55:05 2017 -0700
7 daysMerge branch 'maint'Kyle Meyer1-2/+2
7 daysorg.texi: Correct keys for subtree movement commandsKyle Meyer1-2/+2
* doc/org.texi (Structure editing): Correct bindings for org-move-subtree-up and org-move-subtree-down. Reported-by: Johann Höchtl <<johann.hoechtl@gmail.com>> <https://lists.gnu.org/archive/html/emacs-orgmode/2017-10/msg00203.html>
7 daysMerge branch 'maint'Nicolas Goaziou1-1/+1
7 daysox-md: Export TODO keywords and priority cookiesNicolas Goaziou1-1/+1
* lisp/ox-md.el (org-md-headline): Export TODO keywords and priority cookies. Reported-by: Ganesh Krishnan <gkrishnan.gt@gmail.com> <http://lists.gnu.org/archive/html/emacs-orgmode/2017-10/msg00171.html>
8 daysorg-index.el version 5.6.2U-IHM-NOTEBOOK\Olli1-95/+70
10 daysAdjust version numbers of unreleased changesKyle Meyer2-5/+6
* lisp/org-table.el (org-table-shrunk-column-indicator): * lisp/org.el (org-startup-shrink-all-tables): Update Org version to 9.2 and Emacs version to 27.1. (customize-package-emacs-version-alist): Map Org 9.2 to Emacs 27.1. Emacs 26.1 is now in the pretest phase, and the version for Emacs's development branch is 27.1.
10 daysMerge branch 'maint'Kyle Meyer1-1/+2
10 daysox-s5: Don't use org-html-end-plain-listKyle Meyer1-1/+2
* contrib/lisp/ox-s5.el (org-s5-plain-list): Adjust for the removal of org-html-end-plain-list. The function org-html-end-plain-list was deleted in 8855c23c6 (ox-html: Plain list supports arbitrary attributes, 2017-02-13). Reported-by: <dchechin92@gmail.com> <https://lists.gnu.org/archive/html/emacs-orgmode/2017-10/msg00123.html>
11 daysMerge branch 'maint'Nicolas Goaziou2-2/+114
11 daysorg-clock: Fix clock report sometimes ignoring hours before :wstartGeorgiy Tugai2-2/+114
* lisp/org-clock (org-clocktable-steps): Fix weekly-step clock report ignoring hours between start of period and start of week, when start of period is on a day of week numerically less than start of week. Clock report now always inserts a "week" starting at the start of the period, if necessary; all following weeks start on the start of the week as expected. TINYCHANGE
11 daysMerge branch 'maint'Nicolas Goaziou2-4/+10
11 daysConsider headlines as sentences by themselvesNicolas Goaziou2-4/+10
* lisp/org.el (org-forward-sentence): Consider headlines as sentences by themselves. * testing/lisp/test-org.el (test-org/forward-sentence): Add test. Reported-by: Mat Vibrys <vibrysec@gmail.com> <http://lists.gnu.org/archive/html/emacs-orgmode/2017-10/msg00130.html>
11 daysMerge branch 'maint'Nicolas Goaziou1-3/+4
11 daysC-c C-c on a planning info timestamp fixes dayNicolas Goaziou1-3/+4
* lisp/org.el (org-ctrl-c-ctrl-c): On a timestamp in a planning line, fix day, like regular timestamps. Reported-by: Aaron Jensen <aaronjensen@gmail.com> <http://lists.gnu.org/archive/html/emacs-orgmode/2017-10/msg00132.html>
11 daysorg-inlinetask: Wrap region at insertionMarco Wahl1-6/+13
* lisp/org-inlinetask.el (org-inlinetask-insert-task): If there is a region at insertion time wrap it. This is similar to `org-insert-drawer'.
12 daysMerge branch 'maint'Nicolas Goaziou2-6/+11
12 daysFix `org-backward-paragraph' on an empty headingNicolas Goaziou2-6/+11
* lisp/org.el (org-backward-paragraph): Fix behavior on greater elements without contents. * testing/lisp/test-org.el (test-org/backward-paragraph): Add test. Reported-by: Omar Antolin <omar.antolin@gmail.com> <http://lists.gnu.org/archive/html/emacs-orgmode/2017-10/msg00099.html>
12 daysMerge branch 'maint'Nicolas Goaziou1-5/+4
12 daysFix interactive timestamp entry in capture templatesMatt Lundin1-5/+4
* lisp/org-capture.el: (org-capture-fill-template) Fix interactive timestamp entry to match the behavior of org-time-stamp. This fixes a bug related to the %^t and %^u template escapes which resulted in incorrect timestamps (<2017-10-06 Fri-12:00>). The difference between %^t and %^T now corresponds to the difference between org-time-stamp called without and with a prefix argument.
2017-10-04Merge branch 'maint'Kyle Meyer1-1/+1
2017-10-04Backport commit 5172fa02c from EmacsPaul Eggert1-1/+1
Prefer HTTPS to HTTP for gnu.org 5172fa02cccaab2500ecf85aaf65b8deed54d42e Paul Eggert Sun Oct 1 19:59:01 2017 -0700
2017-10-04Merge branch 'maint'Nicolas Goaziou2-43/+50
2017-10-04Fix `org-backward-paragraph' on block opening linerelease_9.1.2Nicolas Goaziou2-43/+50
* lisp/org.el (org-backward-paragraph): Do not error when called from a block opening line. * testing/lisp/test-org.el (test-org/backward-paragraph): Add tests. Reported-by: Omar Antolin <omar.antolin@gmail.com> <http://lists.gnu.org/archive/html/emacs-orgmode/2017-10/msg00051.html>
2017-10-02Merge branch 'maint'Kyle Meyer1-1/+1
2017-10-02Backport commit 07ea5ef99 from EmacsMartin Rudalics1-1/+1
* doc/org.texi (A Texinfo example): Fix reference style. Fix reference style in org.texi 07ea5ef99a509622981a8ca69aadff15cbc0ef10 Martin Rudalics Sun Oct 1 10:30:33 2017 +0200 <https://lists.gnu.org/archive/html/emacs-devel/2017-10/msg00019.html>
2017-10-02Merge branch 'maint'Kyle Meyer7-15/+29
2017-10-02Backport commit bd49b6f1b from EmacsCharles A. Roelli1-1/+11
* lisp/org-clock.el (org-clock--oldest-date): Only execute 'decode-time' on times later than year -2**31 under macOS 10.6. See Bug#27706. Workaround for faulty localtime() under macOS 10.6 bd49b6f1b39cffeaf6098bc7b0182552683b1c07 Charles A. Roelli Sun Oct 1 19:07:22 2017 +0200
2017-10-02Backport commit bbda601d1 from EmacsPaul Eggert4-10/+10
; Spelling fixes bbda601d1d4e125c9d3c374b56eee3e2e9623f1d Paul Eggert Fri Sep 29 16:41:50 2017 -0700