diff options
| author | Rasmus | 2017-09-29 10:41:51 +0200 |
|---|---|---|
| committer | Rasmus | 2017-09-29 10:41:51 +0200 |
| commit | d4b2bbdc73ace5cb0971a32a75941486489d1cc5 (patch) | |
| tree | dc92eb83d4a66f112e3688ad10632e14ca6601ff /lisp/org | |
| parent | eaefbc26d5c6cffbe4a22d3a9f4c7e6209a7b5a7 (diff) | |
| parent | af130f900fc499f71ea22f10ba055a75ce35ed4e (diff) | |
| download | emacs-d4b2bbdc73ace5cb0971a32a75941486489d1cc5.tar.gz emacs-d4b2bbdc73ace5cb0971a32a75941486489d1cc5.zip | |
Merge branch 'emacs-26' into scratch/org-mode-merge
Diffstat (limited to 'lisp/org')
| -rw-r--r-- | lisp/org/ChangeLog.1 | 4 |
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 @@ | |||
| 5015 | * ox-latex.el (org-latex-listings): Update docstring. | 5015 | * ox-latex.el (org-latex-listings): Update docstring. |
| 5016 | 5016 | ||
| 5017 | * org-pcomplete.el (pcomplete/org-mode/file-option/options): | 5017 | * org-pcomplete.el (pcomplete/org-mode/file-option/options): |
| 5018 | Apply changes to export back-end definiton. | 5018 | Apply changes to export back-end definition. |
| 5019 | 5019 | ||
| 5020 | * org.el (org-get-export-keywords): Apply changes to export | 5020 | * org.el (org-get-export-keywords): Apply changes to export |
| 5021 | back-end definiton. | 5021 | back-end definition. |
| 5022 | 5022 | ||
| 5023 | * ox-html.el (org-html--format-toc-headline): Make use of | 5023 | * ox-html.el (org-html--format-toc-headline): Make use of |
| 5024 | anonymous back-ends. | 5024 | anonymous back-ends. |