[elpa] externals/org 10adc2bbd7 5/6: Merge branch 'bugfix'

[ELPA Syncer]

branch: externals/org
commit 10adc2bbd7aa868c433818af897160a8232019f0
Merge: c07028671d d8fc26aefa
Author: Ihor Radchenko <yantar92@posteo.net>
Commit: Ihor Radchenko <yantar92@posteo.net>

    Merge branch 'bugfix'
---
 lisp/ob-core.el | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index c61f2d4007..90c52f8b78 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))