diff options
Diffstat (limited to 'lisp/org/org.el')
| -rw-r--r-- | lisp/org/org.el | 64 |
1 files changed, 35 insertions, 29 deletions
diff --git a/lisp/org/org.el b/lisp/org/org.el index 9a4f7803cf4..2fbb825015f 100644 --- a/lisp/org/org.el +++ b/lisp/org/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 @@ -4559,21 +4561,25 @@ is available. This option applies only if FILE is a URL." (cache) (is-url (if (org--should-fetch-remote-resource-p file) - (with-current-buffer (url-retrieve-synchronously file) - (goto-char (point-min)) - ;; Move point to after the url-retrieve header. - (search-forward "\n\n" nil :move) - ;; Search for the success code only in the url-retrieve header. - (if (save-excursion - (re-search-backward "HTTP.*\\s-+200\\s-OK" nil :noerror)) - ;; Update the cache `org--file-cache' and return contents. - (puthash file - (buffer-substring-no-properties (point) (point-max)) - org--file-cache) - (funcall (if noerror #'message #'user-error) - "Unable to fetch file from %S" - file) - nil)) + (condition-case error + (with-current-buffer (url-retrieve-synchronously file) + (goto-char (point-min)) + ;; Move point to after the url-retrieve header. + (search-forward "\n\n" nil :move) + ;; Search for the success code only in the url-retrieve header. + (if (save-excursion + (re-search-backward "HTTP.*\\s-+200\\s-OK" nil :noerror)) + ;; Update the cache `org--file-cache' and return contents. + (puthash file + (buffer-substring-no-properties (point) (point-max)) + org--file-cache) + (funcall (if noerror #'message #'user-error) + "Unable to fetch file from %S" + file) + nil)) + (error (if noerror + (message "Org could't download \"%s\": %s %S" file (car error) (cdr error)) + (signal (car error) (cdr error))))) (funcall (if noerror #'message #'user-error) "The remote resource %S is considered unsafe, and will not be downloaded." file))) |