diff options
| author | Stefan Kangas | 2021-12-05 06:30:35 +0100 |
|---|---|---|
| committer | Stefan Kangas | 2021-12-05 06:30:35 +0100 |
| commit | 520a703fa7db07ba82661e68cf4eafe7ba61a8d0 (patch) | |
| tree | f0037702660118d199bd70a0fe644d9dbcaba761 /lisp/org | |
| parent | 8bdea767208257599f6ab727e51dd94f0c1872e1 (diff) | |
| parent | c086358574e3671787394c7b9f6069760e7c6b3c (diff) | |
| download | emacs-520a703fa7db07ba82661e68cf4eafe7ba61a8d0.tar.gz emacs-520a703fa7db07ba82661e68cf4eafe7ba61a8d0.zip | |
Merge from origin/emacs-28
c086358574 Update to Org 9.5.1-15-gdb4805
fef3e60061 * lisp/emacs-lisp/edebug.el (edebug-eval-defun): Minor doc...
a1e30e4106 ; Fix most remaining AUTHORS warnings
f3e6a432c5 ; * doc/misc/efaq.texi (New in Emacs 28): Add more news.
00236cc802 Fix the enumeration values returned by 'try_scrolling'
Diffstat (limited to 'lisp/org')
| -rw-r--r-- | lisp/org/org-version.el | 2 | ||||
| -rw-r--r-- | lisp/org/ox-latex.el | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el index 212069e668f..de75519ec61 100644 --- a/lisp/org/org-version.el +++ b/lisp/org/org-version.el | |||
| @@ -11,7 +11,7 @@ Inserted by installing Org mode or when a release is made." | |||
| 11 | (defun org-git-version () | 11 | (defun org-git-version () |
| 12 | "The Git version of Org mode. | 12 | "The Git version of Org mode. |
| 13 | Inserted by installing Org or when a release is made." | 13 | Inserted by installing Org or when a release is made." |
| 14 | (let ((org-git-version "release_9.5.1-11-g96d91b")) | 14 | (let ((org-git-version "release_9.5.1-15-gdb4805")) |
| 15 | org-git-version)) | 15 | org-git-version)) |
| 16 | 16 | ||
| 17 | (provide 'org-version) | 17 | (provide 'org-version) |
diff --git a/lisp/org/ox-latex.el b/lisp/org/ox-latex.el index 3e3967033a5..c45dc98a09d 100644 --- a/lisp/org/ox-latex.el +++ b/lisp/org/ox-latex.el | |||
| @@ -3706,7 +3706,7 @@ Return PDF file's name." | |||
| 3706 | (let ((outfile (org-export-output-file-name ".tex" subtreep))) | 3706 | (let ((outfile (org-export-output-file-name ".tex" subtreep))) |
| 3707 | (org-export-to-file 'latex outfile | 3707 | (org-export-to-file 'latex outfile |
| 3708 | async subtreep visible-only body-only ext-plist | 3708 | async subtreep visible-only body-only ext-plist |
| 3709 | (lambda (file) (org-latex-compile file))))) | 3709 | #'org-latex-compile))) |
| 3710 | 3710 | ||
| 3711 | (defun org-latex-compile (texfile &optional snippet) | 3711 | (defun org-latex-compile (texfile &optional snippet) |
| 3712 | "Compile a TeX file. | 3712 | "Compile a TeX file. |