Merge branch 'maint'

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:
 ;;

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"))

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