Marco Wahl
620ba14460
Merge branch 'maint'
2017-10-20 12:24:07 +02:00
Marco Wahl
3df62457be
ox-man: Fix org-man--protect-text
2017-10-20 12:21:08 +02:00
Nicolas Goaziou
0cc59cea23
Merge branch 'maint'
2017-10-19 21:52:18 +02:00
Nicolas Goaziou
37142cea78
ox-man: Fix verbatim markup
...
* lisp/ox-man.el (org-man--protect-text): New function.
(org-man-code): Use new function.
(org-man-verbatim): Use inline markup.
2017-10-19 21:51:31 +02:00
Nicolas Goaziou
ff6fbaf395
Merge branch 'maint'
2017-10-18 22:55:18 +02:00
Nicolas Goaziou
ee24c0769b
ox-man: Fix code and verbatim export
...
* 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 >
2017-10-18 22:54:40 +02:00
Nicolas Goaziou
cd9cccb4b2
Merge branch 'maint'
2017-10-18 22:49:10 +02:00
Allen Li
8c5c030c64
Fix `org-insert-todo-heading'
...
* 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.
2017-10-18 22:48:16 +02:00
Nicolas Goaziou
52d4ca4b29
Merge branch 'maint'
2017-10-17 23:31:45 +02:00
Allen Li
90d283f189
Update documentation on org-protocol template placeholders
...
* 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
2017-10-17 23:28:53 +02:00
Nicolas Goaziou
7ac8883394
Move `org-completing-read' into "org-macs.el"
...
* lisp/org-macs.el (org-completing-read): Moved here...
* lisp/org.el: ... from there.
2017-10-17 10:11:21 +02:00
Nicolas Goaziou
45a1918efe
Move `org-xor' into "org-macs.el"
...
* lisp/org.el (org-xor): Move...
* lisp/org-macs.el: ... there.
2017-10-17 09:37:34 +02:00
Nicolas Goaziou
5b2b8f3175
ox-texinfo: Handle "notoc" value
...
* 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.
2017-10-15 16:51:13 +02:00
Nicolas Goaziou
b401d3a44b
Implement `org-export-excluded-from-toc-p'
...
* 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.
2017-10-15 16:51:13 +02:00
Nicolas Goaziou
9b13e44ad7
ox: Implement "notoc" UNNUMBERED value
...
* 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.
2017-10-15 16:51:10 +02:00
Nicolas Goaziou
29b4134687
Improve a docstring
...
* lisp/org-element.el (org-element-lineage): Improve docstring.
2017-10-15 10:29:00 +02:00
Nicolas Goaziou
2525dc6c72
Merge branch 'maint'
2017-10-14 12:32:25 +02:00
Nicolas Goaziou
1d5142601a
Silence byte-compiler
2017-10-14 12:32:08 +02:00
Nicolas Goaziou
7df5d21f79
Merge branch 'maint'
2017-10-14 12:30:59 +02:00
Nicolas Goaziou
827af59873
Fix links without contents in table of contents' entries
...
* 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 >
2017-10-14 12:29:52 +02:00
Nicolas Goaziou
025dbd7f31
ox-koma-letter: Fix typo.
...
* 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 >
2017-10-14 11:03:41 +02:00
Nicolas Goaziou
4ffddc2a93
Merge branch 'maint'
2017-10-14 11:01:32 +02:00
Nicolas Goaziou
5861a55740
`org-file-contents': Improve error message
...
* lisp/org.el (org-file-contents): Improve error message.
2017-10-14 10:59:51 +02:00
Kyle Meyer
8184de6e13
Merge branch 'maint'
2017-10-13 15:13:38 -04:00
Paul Eggert
3f1d5f9091
Backport commit 5d51403ce from Emacs
...
; Typo fixes, mostly repeated words
5d51403ceb9b86a1bfa66f00c7af39f1200e65f1
Paul Eggert
Mon Oct 9 22:55:06 2017 -0700
2017-10-13 15:12:27 -04:00
Paul Eggert
df0e3611f1
Backport commit 0d004ed01 from Emacs
...
; Spelling fixes
0d004ed01abb5fa025bdc9d58fce2a3abff0b6a4
Paul Eggert
Mon Oct 9 22:55:05 2017 -0700
2017-10-13 15:11:00 -04:00
Kyle Meyer
86e6ab697c
Merge branch 'maint'
2017-10-12 01:28:25 -04:00
Kyle Meyer
8c44a3f23d
org.texi: Correct keys for subtree movement commands
...
* 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 >
2017-10-12 01:27:42 -04:00
Nicolas Goaziou
61c81e8255
Merge branch 'maint'
2017-10-12 01:01:14 +02:00
Nicolas Goaziou
76163e983b
ox-md: Export TODO keywords and priority cookies
...
* 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 >
2017-10-12 01:00:14 +02:00
U-IHM-NOTEBOOK\Olli
4d828ba4c6
org-index.el version 5.6.2
2017-10-10 20:28:03 +02:00
Kyle Meyer
0b83168465
Adjust version numbers of unreleased changes
...
* 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.
2017-10-08 13:44:33 -04:00
Kyle Meyer
a343655bb3
Merge branch 'maint'
2017-10-08 10:40:39 -04:00
Kyle Meyer
027cfc3d15
ox-s5: Don't use org-html-end-plain-list
...
* 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 >
2017-10-08 10:39:47 -04:00
Nicolas Goaziou
2a55d206e3
Merge branch 'maint'
2017-10-08 10:54:00 +02:00
Georgiy Tugai
07f939f419
org-clock: Fix clock report sometimes ignoring hours before :wstart
...
* 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
2017-10-08 10:53:39 +02:00
Nicolas Goaziou
fa56da61a7
Merge branch 'maint'
2017-10-08 10:36:48 +02:00
Nicolas Goaziou
d747e51fbf
Consider headlines as sentences by themselves
...
* 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 >
2017-10-08 10:35:22 +02:00
Nicolas Goaziou
7f56bfe0c2
Merge branch 'maint'
2017-10-08 10:08:53 +02:00
Nicolas Goaziou
6432fcd433
C-c C-c on a planning info timestamp fixes day
...
* 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 >
2017-10-08 10:07:36 +02:00
Marco Wahl
5a16dec5a4
org-inlinetask: Wrap region at insertion
...
* 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'.
2017-10-07 15:44:25 +02:00
Nicolas Goaziou
44e3745c78
Merge branch 'maint'
2017-10-06 19:35:25 +02:00
Nicolas Goaziou
fb403ca34e
Fix `org-backward-paragraph' on an empty heading
...
* 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 >
2017-10-06 19:34:28 +02:00
Nicolas Goaziou
9455c6910e
Merge branch 'maint'
2017-10-06 19:14:21 +02:00
Matt Lundin
ce536f6375
Fix interactive timestamp entry in capture templates
...
* 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-06 19:13:57 +02:00
Kyle Meyer
eeaf9aec10
Merge branch 'maint'
2017-10-04 10:44:35 -04:00
Paul Eggert
710a3d1131
Backport commit 5172fa02c from Emacs
...
Prefer HTTPS to HTTP for gnu.org
5172fa02cccaab2500ecf85aaf65b8deed54d42e
Paul Eggert
Sun Oct 1 19:59:01 2017 -0700
2017-10-04 10:43:02 -04:00
Nicolas Goaziou
1b12ad5cf6
Merge branch 'maint'
2017-10-04 12:58:41 +02:00
Nicolas Goaziou
ef6dac812b
Fix `org-backward-paragraph' on block opening line
...
* 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-04 12:57:14 +02:00
Kyle Meyer
7a2b642ad1
Merge branch 'maint'
2017-10-02 09:41:35 -04:00