summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2017-08-13 16:23:33 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2017-08-13 16:23:33 +0200
commit940c90ec97c325ac4b5efd64a408e051a2489ad8 (patch)
treea1eb2b29542f857b3c72d350c79da1792270a3a4
parent15e992c6da0ee6bd4b11274aa51362bd9821c7ab (diff)
parent6f5cacd607b40b5bf2d0a18f7678f7aa0459536f (diff)
downloadorg-mode-940c90ec97c325ac4b5efd64a408e051a2489ad8.tar.gz
Merge branch 'maint'
-rw-r--r--doc/org.texi1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/org.texi b/doc/org.texi
index 944c9c5..032087f 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -15541,6 +15541,7 @@ Org supports the following languages for the @samp{src} code blocks:
Additional documentation for some languages are at
@uref{http://orgmode.org/worg/org-contrib/babel/languages.html}.
+@vindex org-babel-load-languages
By default, only @code{emacs-lisp} is enabled for evaluation. To enable or
disable other languages, customize the @code{org-babel-load-languages}
variable either through the Emacs customization interface, or by adding code