summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIhor Radchenko <yantar92@posteo.net>2024-09-22 12:35:28 +0200
committerIhor Radchenko <yantar92@posteo.net>2024-09-22 12:35:28 +0200
commit10adc2bbd7aa868c433818af897160a8232019f0 (patch)
tree2a09b3649c9aaa411fe3653227ea97ffb3c01cbf
parentc07028671dc5820a8726b75ac9542ec7773bf1dc (diff)
parentd8fc26aefa70a0fcbbbbbb73ef09f4b6b0b600a8 (diff)
Merge branch 'bugfix'
-rw-r--r--lisp/ob-core.el27
1 files changed, 18 insertions, 9 deletions
diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index c61f2d400..90c52f8b7 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -358,18 +358,27 @@ a window into the `org-babel-get-src-block-info' function."
(full (lambda (it) (> (length it) 0)))
(printf (lambda (fmt &rest args) (princ (apply #'format fmt args)))))
(when info
- (with-help-window (help-buffer)
- (let ((name (nth 4 info))
- (lang (nth 0 info))
- (switches (nth 3 info))
- (header-args (nth 2 info)))
+ (let* ((name (nth 4 info))
+ (language (nth 0 info))
+ (switches (nth 3 info))
+ (header-args (nth 2 info))
+ (property-header-args
+ (org-entry-get (point) "header-args" t))
+ (property-header-args-language
+ (org-entry-get (point) (concat "header-args:" language) t)))
+ (with-help-window (help-buffer)
(when name (funcall printf "Name: %s\n" name))
- (when lang (funcall printf "Lang: %s\n" lang))
+ (when language (funcall printf "Language: %s\n" language))
+ ;; Show header arguments that have been set through
+ ;; properties (i.e. in property drawers or through
+ ;; #+PROPERTY)
(funcall printf "Properties:\n")
- (funcall printf "\t:header-args \t%s\n" (org-entry-get (point) "header-args" t))
- (funcall printf "\t:header-args:%s \t%s\n" lang (org-entry-get (point) (concat "header-args:" lang) t))
-
+ (funcall printf "\t:header-args \t%s\n" property-header-args)
+ (funcall printf "\t:header-args:%s \t%s\n" language property-header-args-language)
+ ;; Show switches
(when (funcall full switches) (funcall printf "Switches: %s\n" switches))
+ ;; Show default header arguments and header arguments that
+ ;; have been explicitly set in the current code block.
(funcall printf "Header Arguments:\n")
(dolist (pair (sort header-args
(lambda (a b) (string< (symbol-name (car a))