Commit 613c9a5c authored by Rasmus's avatar Rasmus

Update Org to v9.1.9

Please note this is a bugfix release. See etc/ORG-NEWS for details.
parent 1b075a9e
This diff is collapsed.
This diff is collapsed.
......@@ -21,7 +21,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
Author: Jambunathan K <kjambunathan at gmail dot com>
Keywords: outlines, hypermedia, calendar, wp
Homepage: http://orgmode.org
Homepage: https://orgmode.org
Commentary:
......
% Reference Card for Org Mode
\def\orgversionnumber{9.1.6}
\def\orgversionnumber{9.1.9}
\def\versionyear{2018} % latest update
\input emacsver.tex
......
......@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Thierry Banel
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -4,7 +4,7 @@
;; Author: Oleh Krehel
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Dan Davison
;; Keywords: literate programming, reproducible research, R, statistics
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -5,7 +5,7 @@
;; Author: Joel Boehland, Eric Schulte, Oleh Krehel, Frederick Giasson
;;
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research, comint
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -5,7 +5,7 @@
;; Authors: Eric Schulte
;; Dan Davison
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......@@ -980,13 +980,24 @@ with a prefix argument then this is passed on to
(defmacro org-babel-do-in-edit-buffer (&rest body)
"Evaluate BODY in edit buffer if there is a code block at point.
Return t if a code block was found at point, nil otherwise."
`(let ((org-src-window-setup 'switch-invisibly))
(when (and (org-babel-where-is-src-block-head)
(declare (debug (body)))
`(let* ((element (org-element-at-point))
;; This function is not supposed to move point. However,
;; `org-edit-src-code' always moves point back into the
;; source block. It is problematic if the point was before
;; the code, e.g., on block's opening line. In this case,
;; we want to restore this location after executing BODY.
(outside-position
(and (<= (line-beginning-position)
(org-element-property :post-affiliated element))
(point-marker)))
(org-src-window-setup 'switch-invisibly))
(when (and (org-babel-where-is-src-block-head element)
(org-edit-src-code))
(unwind-protect (progn ,@body)
(org-edit-src-exit))
(org-edit-src-exit)
(when outside-position (goto-char outside-position)))
t)))
(def-edebug-spec org-babel-do-in-edit-buffer (body))
(defun org-babel-do-key-sequence-in-edit-buffer (key)
"Read key sequence and execute the command in edit buffer.
......
......@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -4,7 +4,7 @@
;; Author: Michael Gauland
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; Version: 1.00
;; This file is part of GNU Emacs.
......
......@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research, comint
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -5,7 +5,7 @@
;; Authors: Eric Schulte
;; Dan Davison
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research, forth
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -5,7 +5,7 @@
;; Authors: Sergey Litvinov
;; Eric Schulte
;; Keywords: literate programming, reproducible research, fortran
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
;;
......
......@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -4,7 +4,7 @@
;; Author: Miro Bezjak
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......@@ -84,12 +84,12 @@ in BODY as elisp."
(when session (error "Sessions are not (yet) supported for Groovy"))
(pcase result-type
(`output
(let ((src-file (org-babel-temp-file "groovy-")))
(let ((src-file (org-babel-temp-file "groovy_")))
(progn (with-temp-file src-file (insert body))
(org-babel-eval
(concat org-babel-groovy-command " " src-file) ""))))
(`value
(let* ((src-file (org-babel-temp-file "groovy-"))
(let* ((src-file (org-babel-temp-file "groovy_"))
(wrapper (format org-babel-groovy-wrapper-method body)))
(with-temp-file src-file (insert wrapper))
(let ((raw (org-babel-eval
......
......@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -4,7 +4,7 @@
;; Author: Simon Michael
;; Keywords: literate programming, reproducible research, plain text accounting
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -4,7 +4,7 @@
;; Author: Andrzej Lichnerowicz
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research, js
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -4,7 +4,7 @@
;; Author: Eric S Fraga
;; Keywords: literate programming, reproducible research, accounting
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -4,7 +4,7 @@
;; Author: Martyn Jago
;; Keywords: babel language, literate programming
;; Homepage: http://orgmode.org/worg/org-contrib/babel/languages/ob-doc-lilypond.html
;; Homepage: https://orgmode.org/worg/org-contrib/babel/languages/ob-doc-lilypond.html
;; This file is part of GNU Emacs.
......@@ -24,7 +24,7 @@
;;; Commentary:
;; Installation, ob-lilypond documentation, and examples are available at
;; http://orgmode.org/worg/org-contrib/babel/languages/ob-doc-lilypond.html
;; https://orgmode.org/worg/org-contrib/babel/languages/ob-doc-lilypond.html
;;
;; Lilypond documentation can be found at
;; http://lilypond.org/manuals.html
......
......@@ -6,7 +6,7 @@
;; Eric Schulte
;; David T. O'Toole <dto@gnu.org>
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -5,7 +5,7 @@
;; Authors: Eric Schulte
;; Dan Davison
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......@@ -79,17 +79,24 @@ if so then run the appropriate source block from the Library."
(org-babel-execute-src-block nil info)
t)))
(defun org-babel-lob--src-info (name)
"Return internal representation for Babel data named NAME.
NAME is a string. This function looks into the current document
(defun org-babel-lob--src-info (ref)
"Return internal representation for Babel data referenced as REF.
REF is a string. This function looks into the current document
for a Babel call or source block. If none is found, it looks
after NAME in the Library of Babel. Eventually, if that also
fails, it returns nil."
;; During export, look into the pristine copy of the document being
;; exported instead of the current one, which could miss some data.
(with-current-buffer (or org-babel-exp-reference-buffer (current-buffer))
(org-with-wide-buffer
(goto-char (point-min))
after REF in the Library of Babel."
(let ((name ref)
(file nil))
;; Extract the remote file, if specified in the reference.
(when (string-match "\\`\\(.+\\):\\(.+\\)\\'" ref)
(setq file (match-string 1 ref))
(setq name (match-string 2 ref)))
;; During export, look into the pristine copy of the document
;; being exported instead of the current one, which could miss
;; some data.
(with-current-buffer (cond (file (find-file-noselect file t))
(org-babel-exp-reference-buffer)
(t (current-buffer)))
(org-with-point-at 1
(catch :found
(let ((case-fold-search t)
(regexp (org-babel-named-data-regexp-for-name name)))
......@@ -100,23 +107,26 @@ fails, it returns nil."
(pcase (org-element-type element)
(`src-block (org-babel-get-src-block-info t element))
(`babel-call (org-babel-lob-get-info element))
;; Non-executable data found. Since names are
;; supposed to be unique throughout a document,
;; bail out.
;; Non-executable data found. Since names
;; are supposed to be unique throughout
;; a document, bail out.
(_ nil))))))
;; No element named NAME in buffer. Try Library of Babel.
(cdr (assoc-string name org-babel-library-of-babel)))))))
(cdr (assoc-string ref org-babel-library-of-babel))))))))
;;;###autoload
(defun org-babel-lob-get-info (&optional datum)
"Return internal representation for Library of Babel function call.
Consider DATUM, when provided, or element at point. Return nil
when not on an appropriate location. Otherwise return a list
compatible with `org-babel-get-src-block-info', which see."
Consider DATUM, when provided, or element at point otherwise.
Return nil when not on an appropriate location. Otherwise return
a list compatible with `org-babel-get-src-block-info', which
see."
(let* ((context (or datum (org-element-context)))
(type (org-element-type context)))
(type (org-element-type context))
(reference (org-element-property :call context)))
(when (memq type '(babel-call inline-babel-call))
(pcase (org-babel-lob--src-info (org-element-property :call context))
(pcase (org-babel-lob--src-info reference)
(`(,language ,body ,header ,_ ,_ ,_ ,coderef)
(let ((begin (org-element-property (if (eq type 'inline-babel-call)
:begin
......
......@@ -4,7 +4,7 @@
;; Authors: Dieter Schoen
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -5,7 +5,7 @@
;; Author: Eric Schulte
;; Thomas S. Dye
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -4,7 +4,7 @@
;; Author: Dan Davison
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -5,7 +5,7 @@
;; Author: Eric S Fraga
;; Eric Schulte
;; Keywords: literate programming, reproducible research, maxima
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -4,7 +4,7 @@
;; Author: Juan Pechiar
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -4,7 +4,7 @@
;; Author: Dan Davison
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -5,7 +5,7 @@
;; Authors: Dan Davison
;; Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -5,7 +5,7 @@
;; Authors: Thorsten Jolitz
;; Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -4,7 +4,7 @@
;; Author: Zhang Weize
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -4,7 +4,7 @@
;; Author: Jarmo Hurri (adapted from ob-asymptote.el written by Eric Schulte)
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -5,7 +5,7 @@
;; Authors: Eric Schulte
;; Dan Davison
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -5,7 +5,7 @@
;; Authors: Eric Schulte
;; Dan Davison
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -5,7 +5,7 @@
;; Authors: Eric Schulte
;; Michael Gauland
;; Keywords: literate programming, reproducible research, scheme
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -4,7 +4,7 @@
;; Author: Benjamin Andresen
;; Keywords: literate programming, interactive shell
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......
......@@ -4,7 +4,7 @@
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research, shen
;; Homepage: http://orgmode.org
;; Homepage: https://orgmode.org
;; This file is part of GNU Emacs.
......