mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-29 18:36:26 +00:00
Code Releases Activity

Merge branch 'maint'

Browse source
This commit is contained in:
Nicolas Goaziou 2016-08-28 12:02:51 +02:00
parent 3b3fc520aa b7c144a104
commit 7a14bd172c
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/org.el
View file

@ -1839,7 +1839,7 @@ links in Org buffers can have an optional tag after a double colon, e.g.,
[[linkkey:tag][description]]
The `linkkey' must be a word word, starting with a letter, followed
The `linkkey' must be a single word, starting with a letter, followed
by letters, numbers, `-' or `_'.
If REPLACE is a string, the tag will simply be appended to create the link.

2
lisp/ox-html.el
View file

@ -2629,7 +2629,7 @@ CONTENTS is nil. INFO is a plist holding contextual information."
CONTENTS holds the contents of the item. INFO is a plist holding
contextual information."
(let ((lang (org-element-property :language inline-src-block))
(code (org-html-format-code inline-src-block info))
(code (org-element-property :value inline-src-block))
(label
(let ((lbl (and (org-element-property :name inline-src-block)
(org-export-get-reference inline-src-block info))))