diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2021-01-24 23:12:33 -0500 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2021-01-24 23:12:33 -0500 |
| commit | bc511b1cb8b67ad68b31edee1378ea02c43250a8 (patch) | |
| tree | c2627878f3a41e415aa3654e6c117cbe01c863af | |
| parent | 72e368a2e9f126bcc4f3b67ef2d16009e8819127 (diff) | |
| parent | 0abd4a44cbd894c3dbadc8d44ab90eb6d7c9af8b (diff) | |
| download | org-mode-bc511b1cb8b67ad68b31edee1378ea02c43250a8.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/org-install.el | 2 | ||||
| -rw-r--r-- | lisp/ox-latex.el | 2 | ||||
| -rw-r--r-- | mk/org-fixup.el | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lisp/org-install.el b/lisp/org-install.el index 5835959..d521d81 100644 --- a/lisp/org-install.el +++ b/lisp/org-install.el @@ -1,4 +1,4 @@ -;;; org-install.el --- backward compatibility file for obsolete configuration +;;; org-install.el --- backward compatibility file for obsolete configuration -*- lexical-binding: t -*- ;; ;;; Code: ;; diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el index 44d83e3..376d27a 100644 --- a/lisp/ox-latex.el +++ b/lisp/ox-latex.el @@ -956,7 +956,7 @@ URL `https://orgmode.org/worg/org-tutorials/org-latex-preview.html'." (tex "TeX") (latex "[LaTeX]TeX") (shell-script "bash") (gnuplot "Gnuplot") - (ocaml "Caml") (caml "Caml") + (ocaml "[Objective]Caml") (caml "Caml") (sql "SQL") (sqlite "sql") (makefile "make") (R "r")) diff --git a/mk/org-fixup.el b/mk/org-fixup.el index bc7c6e5..c0eef23 100644 --- a/mk/org-fixup.el +++ b/mk/org-fixup.el @@ -43,7 +43,7 @@ work correctly if this file is not present (except directly from the Git work tree)." (with-temp-buffer (insert "\ -;;; org-version.el --- autogenerated file, do not edit +;;; org-version.el --- autogenerated file, do not edit -*- lexical-binding: t -*- ;; ;;; Code: ;;;\#\#\#autoload |