summaryrefslogtreecommitdiff
path: root/lisp/org
diff options
context:
space:
mode:
authorRasmus <rasmus@gmx.us>2017-09-29 10:41:51 +0200
committerRasmus <rasmus@gmx.us>2017-09-29 10:41:51 +0200
commitd4b2bbdc73ace5cb0971a32a75941486489d1cc5 (patch)
treedc92eb83d4a66f112e3688ad10632e14ca6601ff /lisp/org
parenteaefbc26d5c6cffbe4a22d3a9f4c7e6209a7b5a7 (diff)
parentaf130f900fc499f71ea22f10ba055a75ce35ed4e (diff)
downloademacs-d4b2bbdc73ace5cb0971a32a75941486489d1cc5.tar.gz
Merge branch 'emacs-26' into scratch/org-mode-merge
Diffstat (limited to 'lisp/org')
-rw-r--r--lisp/org/ChangeLog.14
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org/ChangeLog.1 b/lisp/org/ChangeLog.1
index 366a3ee9fcd..ee50f6fb040 100644
--- a/lisp/org/ChangeLog.1
+++ b/lisp/org/ChangeLog.1
@@ -5015,10 +5015,10 @@
* ox-latex.el (org-latex-listings): Update docstring.
* org-pcomplete.el (pcomplete/org-mode/file-option/options):
- Apply changes to export back-end definiton.
+ Apply changes to export back-end definition.
* org.el (org-get-export-keywords): Apply changes to export
- back-end definiton.
+ back-end definition.
* ox-html.el (org-html--format-toc-headline): Make use of
anonymous back-ends.