49dc91c55e
Merge branch 'maint'
2017-06-13 10:41:41 +02:00
2040b61391
org-element: Remove outdated comments
2017-06-13 10:41:13 +02:00
5e35bc1807
Merge branch 'maint'
2017-06-11 11:39:37 +02:00
62dc27dc75
ox-texinfo: Fix spurious "nil" in "special block export
...
* lisp/ox-texinfo.el (org-texinfo-special-block): Remove spurious
"nil" when no option is defined.
2017-06-11 11:38:45 +02:00
8ebfbc1d2a
Merge branch 'maint'
2017-06-10 00:14:30 +02:00
b8df40eccc
ob-shell: Fix handling list variables
...
* lisp/ob-shell.el (org-babel--variable-assignments:bash): Do not
error when value is a list.
* testing/lisp/test-ob-shell.el (ob-shell/simple-list): New test.
Reported-by: Keith Amidon <camalot@picnicpark.org>
<http://permalink.gmane.org/gmane.emacs.orgmode/113920 >
2017-06-10 00:06:24 +02:00
a933b34992
Merge branch 'maint'
2017-06-09 16:18:24 -04:00
7cd7b90dcb
Update remote file syntax for Tramp
...
* testing/lisp/test-ox.el (test-org-export/file-uri):
* doc/org.texi (External links): The method part of remote file names
is mandatory now in the emacs master (26+). A valid remote file name
starts with "/method:host:" or "/method:user@host:". ssh is used as
an example method here.
This change in the examples is backward compatible with emacs 25, 24, ..
Suggested by: Michael Albinus <michael.albinus@gmx.de>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-06/msg00151.html >
Relevant commit in emacs master causing this change:
<http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=ed33337c3e0d0b1a8b140e23168421ea43d79324 >
2017-06-09 16:15:15 -04:00
cf505d2ebb
ox-texinfo: Export example blocks as @example
...
* lisp/ox-texinfo.el (org-texinfo-example-block): Export as @example.
Escape @, {, }, however, so as to get proper verbatim contents.
2017-06-09 22:03:08 +02:00
28bb7777b4
Merge branch 'maint'
2017-06-09 21:23:17 +02:00
4bdf11a967
org-macro: Silence byte-compiler
2017-06-09 21:22:53 +02:00
657ed58eac
org-macro: Fix incomplete docstring
...
* lisp/org-macro.el (org-macro--counter-increment): Fix incomplete
docstring. Small refactoring.
2017-06-09 10:22:51 +02:00
54344574c6
Merge branch 'maint'
2017-06-09 09:45:08 +02:00
9a8506b7af
org-footnote: Fix footnote deletion
...
* lisp/org-footnote.el (org-footnote-delete-definitions): Preserve
blank lines after the definition.
* testing/lisp/test-org-footnote.el (test-org-footnote/delete): Add
test.
2017-06-09 09:43:49 +02:00
c24c07c810
Merge branch 'maint'
2017-06-08 23:28:03 +02:00
9fdc77a3cd
ox-texinfo: Improve entities handling
...
* lisp/ox-texinfo.el (org-texinfo-entity): Use Texinfo specific
commands whenever possible.
2017-06-08 23:26:26 +02:00
feb34a1fbf
Merge branch 'maint'
2017-06-08 21:17:09 +02:00
a138fedfd2
ox-texinfo: Use UTF-8 instead of LaTeX for entities
...
* lisp/ox-texinfo.el (org-texinfo-entity): Use UTF-8 instead of LaTeX
for entities.
2017-06-08 21:16:43 +02:00
52e0a83f32
Merge branch 'maint'
2017-06-08 21:00:51 +02:00
6921d84198
ox: Fix search cell error on footnote sections
...
* lisp/ox.el (org-export--install-footnote-definitions):
Provide :raw-value property when building a virtual footnote
section, as `org-export-search-cells' expects it.
2017-06-08 20:59:29 +02:00
ddc80b628a
Merge branch 'maint'
2017-06-08 15:16:20 +02:00
f03387ef90
ox-texinfo: Fix special characters in plain text
...
* lisp/ox-texinfo.el (org-texinfo-plain-text): Add missing
discretionary hyphenation point. Tiny refactoring.
2017-06-08 15:14:48 +02:00
8e8094b919
Merge branch 'maint'
2017-06-08 15:04:55 +02:00
3cf6345b40
org-macro: Fix macro expansion in commented trees
...
* lisp/org-macro.el (org-macro-replace-all): Prevent macro expansion
in commented trees.
* testing/lisp/test-org-macro.el (test-org/macro-replace-all): Add
tests.
* testing/lisp/test-ox.el (test-org-export/expand-macro): Remove
tests.
2017-06-08 14:59:34 +02:00
3e11697ead
Merge branch 'maint'
2017-06-08 13:03:14 +02:00
da8b8f0774
org-compat: Add obsolete aliases for link fontification functions
...
* lisp/org-compat.el (org-activate-bracket-links):
(org-activate-plain-links):
(org-activate-angle-links): Define aliases for backward compatibility.
2017-06-08 13:01:44 +02:00
c5bb67ef60
ox-texinfo: Do not consider :sep value as a regexp
...
* lisp/ox-texinfo.el (org-texinfo-item): Do not consider :sep value as
a regexp.
2017-06-08 09:04:31 +02:00
7b3ec6c105
Merge branch 'maint'
2017-06-08 00:59:06 +02:00
9f5c252f93
org-src: Fix footnote reference remote editing
...
* lisp/org-src.el (org-edit-footnote-reference): Do not collapse
footnote definitions after editing remotely one of them.
* testing/lisp/test-org-src.el (test-org-src/footnote-references): New
test.
2017-06-08 00:57:38 +02:00
3b8037f316
org-src: Raise an error when source buffer is unreachable
...
* lisp/org-src.el (org-edit-src-exit): Raise an error when source
buffer is unreachable.
2017-06-08 00:57:23 +02:00
4c24ecc073
Merge branch 'maint'
2017-06-07 18:40:56 -04:00
51b743fc29
Mention org-speed-command-help in Speed Keys info node
...
* doc/org.texi (Speed keys): Mention org-speed-command-help.
2017-06-07 18:37:23 -04:00
84cfa58d4a
org-element: Fix footnote definition parser
...
* lisp/org-element.el (org-element-footnote-definition-parser):
* testing/lisp/test-org-element.el (test-org-element/footnote-definition-parser):
Add tests.
2017-06-07 23:45:17 +02:00
a2c13a31bb
Merge branch 'maint'
2017-06-07 22:39:03 +02:00
1c71172c54
ox-texinfo: Tolerate indicating commands without @-sign
...
* lisp/ox-texinfo.el (org-texinfo-def-table-markup): Improve
docstring.
(org-texinfo-plain-list): Tolerate indicating commands without @-sign.
2017-06-07 22:38:02 +02:00
8dc31ed680
ox-texinfo: Implement the :sep attribute in plain lists
...
* lisp/ox-texinfo.el (org-texinfo-item):
* doc/org.texi (Plain lists in Texinfo export):
2017-06-07 22:17:08 +02:00
16f735f1cb
Merge branch 'maint'
2017-06-07 12:23:56 +02:00
8305c9381e
ox-texinfo: Remove spurious blank line in fixed width areas
...
* lisp/ox-texinfo.el (org-texinfo-fixed-width): Remove spurious blank
line.
2017-06-07 12:23:20 +02:00
0ff8ba5907
ox-texinfo: Use @code instead of @verb for inline src blocks
...
* lisp/ox-texinfo.el (org-texinfo-inline-src-block): Use @code.
2017-06-07 00:16:35 +02:00
fdac3c0140
ox-texinfo: By default, use @samp instead of @verb for =...=
...
* lisp/ox-texinfo.el (org-texinfo-text-markup-alist): Change default
value.
(org-texinfo--text-markup): Handle protected @samp{...} command.
@samp{} is more versatile than @verb{} as it can belong to more
commands. So, it makes more sense as a default value.
2017-06-07 00:00:31 +02:00
f0f8ca730e
Merge branch 'maint'
2017-06-06 23:51:57 +02:00
b13e672977
ox-texinfo: More fixes to cross-referencing
...
* lisp/ox-texinfo.el (org-texinfo--sanitize-title): New function.
(org-texinfo--get-node): Use new function. Tiny improvement over
aesthetics of duplicate node names.
(org-texinfo--sanitize-node): Fix docstring.
(org-texinfo-headline): Use new function
(org-texinfo--@ref): Remove colons and protect commas in description.
(org-texinfo-link): Use new function. Better handling of targets
within headings.
(org-texinfo--format-entries): Use new function. Remove colons from
menu entries.
2017-06-06 23:48:33 +02:00
53011308a5
Merge branch 'maint'
2017-06-06 02:20:51 +02:00
93bc1b7c7e
ox-texinfo: Improve algorithm to make node names unique
...
* lisp/ox-texinfo.el (org-texinfo--get-node): Use numbers to
differentiate between common base node names instead of "x".
2017-06-06 02:18:40 +02:00
d44cadbe3e
ox-texinfo: Fix conflicts between @node and @anchor names
...
* lisp/ox-texinfo.el (org-texinfo--get-node): Prevent using reserved
"Top" node.
(org-texinfo-radio-target):
(org-texinfo-src-block):
(org-texinfo-table):
(org-texinfo-target): Use `org-texinfo--get-node' instead of
`org-export-get-reference'.
2017-06-06 02:18:40 +02:00
c822329faf
ox-texinfo: Additional fix to @ref commands
...
* lisp/ox-texinfo.el (org-texinfo--@ref): New function.
(org-texinfo-link): Use new function.
When node name doesn't correspond to actual title, use the third @ref
argument to ensure the node name is not printed nor displayed.
2017-06-06 02:18:40 +02:00
bffe447778
Merge branch 'maint'
2017-06-06 00:23:13 +02:00
6f12dfbcb0
ox-texinfo: Fix @ref{...} handling
...
* lisp/ox-texinfo.el (org-texinfo-link): Fix @ref{...} handling. Use
third argument as description. Without description, use
one-argument @ref.
2017-06-06 00:21:53 +02:00
e7147682f3
Merge branch 'maint'
2017-06-05 23:40:48 +02:00
439fcfbbf2
Fix link fontification
...
* lisp/org.el (org-activate-links): Delegate to
`org-element-link-parser' to handle blanks and link expansion.
2017-06-05 23:39:42 +02:00
Nicolas Goaziou
Kaushal Modi