diff --git a/lisp/ob-core.el b/lisp/ob-core.el index a2a84ad20..b8206bc03 100644 --- a/lisp/ob-core.el +++ b/lisp/ob-core.el @@ -2427,13 +2427,13 @@ INFO may provide the values of these header arguments (in the (delete-region (point) (org-babel-result-end))) ((member "append" result-params) (goto-char (org-babel-result-end)) (setq beg (point-marker))) - ;; ((member "prepend" result-params)) ; Do nothing. Already there. + ;; ((member "prepend" result-params)) ; already there ) (setq results-switches (if results-switches (concat " " results-switches) "")) (let ((wrap - (lambda ( start finish &optional no-escape no-newlines - inline-start inline-finish) + (lambda (start finish &optional no-escape no-newlines + inline-start inline-finish) (when inline (setq start inline-start) (setq finish inline-finish) diff --git a/lisp/org-macs.el b/lisp/org-macs.el index fabeac4d2..306990280 100644 --- a/lisp/org-macs.el +++ b/lisp/org-macs.el @@ -37,9 +37,16 @@ ;;; Org version verification. (defvar org--inhibit-version-check nil - "When non-nil, assume that Org is a part of Emacs source. + "When non-nil, skip the detection of mixed-versions situations. For internal use only. See Emacs bug #62762. -This variable is only supposed to be changed by Emacs build scripts.") +This variable is only supposed to be changed by Emacs build scripts. +When nil, Org tries to detect when Org source files were compiled with +a different version of Org (which tends to lead to incorrect `.elc' files), +or when the current Emacs session has loaded a mix of files from different +Org versions (typically the one bundled with Emacs and another one installed +from GNU ELPA), which can happen if some parts of Org were loaded before +`load-path' was changed (e.g. before the GNU-ELPA-installed Org is activated +by `package-activate-all').") (defmacro org-assert-version () "Assert compile time and runtime version match." ;; We intentionally use a more permissive `org-release' instead of