Merge branch 'maint'

2017-12-03 18:14:48 +01:00 · 2017-12-03 18:14:48 +01:00 · a0e3f1d505
parent 7fc901ca0f 037db00f40
commit a0e3f1d505
1 changed files with 1 additions and 1 deletions
--- a/lisp/org.el
+++ b/lisp/org.el
@ -21178,7 +21178,7 @@ an argument, unconditionally call `org-insert-heading'."
    "--"
    ["Export/Publish..." org-export-dispatch t]
    ("LaTeX"
-     ["Org CDLaTeX mode" org-cdlatex-mode :active (featurep 'cdlatex)
+     ["Org CDLaTeX mode" org-cdlatex-mode :active (require 'cdlatex nil t)
      :style toggle :selected org-cdlatex-mode]
     ["Insert Environment" cdlatex-environment (fboundp 'cdlatex-environment)]
     ["Insert math symbol" cdlatex-math-symbol (fboundp 'cdlatex-math-symbol)]