mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-11-28 07:44:49 +00:00
Merge branch 'bugfix'
This commit is contained in:
commit
973669389b
@ -18123,7 +18123,8 @@ evaluating untrusted code blocks by prompting for a confirmation.
|
||||
|
||||
- =yes= ::
|
||||
|
||||
Org always evaluates the source code without asking permission.
|
||||
Org evaluates the source code, possibly asking permission according
|
||||
to ~org-confirm-babel-evaluate~.
|
||||
|
||||
- =never= or =no= ::
|
||||
|
||||
|
30
lisp/org.el
30
lisp/org.el
@ -297,47 +297,49 @@ default, only Emacs Lisp is loaded, since it has no specific
|
||||
requirement."
|
||||
:group 'org-babel
|
||||
:set 'org-babel-do-load-languages
|
||||
:version "24.1"
|
||||
:package-version '(Org . "9.6")
|
||||
:type '(alist :tag "Babel Languages"
|
||||
:key-type
|
||||
(choice
|
||||
(const :tag "Awk" awk)
|
||||
(const :tag "C" C)
|
||||
(const :tag "C, D, C++, and cpp" C)
|
||||
(const :tag "R" R)
|
||||
(const :tag "Calc" calc)
|
||||
(const :tag "Clojure" clojure)
|
||||
(const :tag "Clojure and ClojureScript" clojure)
|
||||
(const :tag "CSS" css)
|
||||
(const :tag "Ditaa" ditaa)
|
||||
(const :tag "Dot" dot)
|
||||
(const :tag "Emacs Lisp" emacs-lisp)
|
||||
(const :tag "Eshell" eshell)
|
||||
(const :tag "Forth" forth)
|
||||
(const :tag "Fortran" fortran)
|
||||
(const :tag "Gnuplot" gnuplot)
|
||||
(const :tag "GnuPlot" gnuplot)
|
||||
(const :tag "Groovy" groovy)
|
||||
(const :tag "Haskell" haskell)
|
||||
(const :tag "Java" java)
|
||||
(const :tag "Javascript" js)
|
||||
(const :tag "LaTeX" latex)
|
||||
(const :tag "Lilypond" lilypond)
|
||||
(const :tag "JavaScript" js)
|
||||
(const :tag "Julia" julia)
|
||||
(const :tag "LaTeX" latex)
|
||||
(const :tag "LilyPond" lilypond)
|
||||
(const :tag "Lisp" lisp)
|
||||
(const :tag "Lua" lua)
|
||||
(const :tag "Makefile" makefile)
|
||||
(const :tag "Maxima" maxima)
|
||||
(const :tag "Matlab" matlab)
|
||||
(const :tag "Ocaml" ocaml)
|
||||
(const :tag "Octave" octave)
|
||||
(const :tag "OCaml" ocaml)
|
||||
(const :tag "Octave and MatLab" octave)
|
||||
(const :tag "Org" org)
|
||||
(const :tag "Perl" perl)
|
||||
(const :tag "Pico Lisp" picolisp)
|
||||
(const :tag "Processing" processing)
|
||||
(const :tag "PlantUML" plantuml)
|
||||
(const :tag "Python" python)
|
||||
(const :tag "Ruby" ruby)
|
||||
(const :tag "Sass" sass)
|
||||
(const :tag "Scala" scala)
|
||||
(const :tag "Scheme" scheme)
|
||||
(const :tag "Screen" screen)
|
||||
(const :tag "Sed" sed)
|
||||
(const :tag "Shell Script" shell)
|
||||
(const :tag "Sql" sql)
|
||||
(const :tag "Sqlite" sqlite)
|
||||
(const :tag "Stan" stan))
|
||||
(const :tag "Sqlite" sqlite))
|
||||
:value-type (boolean :tag "Activate" :value t)))
|
||||
|
||||
;;;; Customization variables
|
||||
|
Loading…
Reference in New Issue
Block a user