[elpa] externals/org 78846b2ae0 2/2: Merge branch 'bugfix'

[ELPA Syncer]

branch: externals/org
commit 78846b2ae079f453f52dd308b53be668df6b237a
Merge: 95f77669e0 83fe95d2ee
Author: Ihor Radchenko <yantar92@posteo.net>
Commit: Ihor Radchenko <yantar92@posteo.net>

    Merge branch 'bugfix'
---
 lisp/ob-core.el     | 20 +++++++++++---------
 lisp/org-persist.el |  4 ++--
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index 727ace8446..0878c27a14 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -2453,8 +2453,8 @@ the inline source block.  The macro is stripped upon 
export.
 Multiline and non-scalar RESULTS from inline source blocks are
 not allowed.  When EXEC-TIME is provided it may be included in a
 generated message.  With optional argument RESULT-PARAMS controls
-insertion of results in the Org mode file.  RESULT-PARAMS can
-take the following values:
+insertion of results in the Org mode file.  RESULT-PARAMS is a list
+that can contain the following values:
 
 replace - (default option) insert results after the source block
           or inline source block replacing any previously
@@ -2513,15 +2513,17 @@ list ---- the results are rendered as a list.  This 
option not
 table --- the results are rendered as a table.  This option not
           allowed for inline source blocks.
 
-INFO may provide the values of these header arguments (in the
-`header-arguments-alist' see the docstring for
-`org-babel-get-src-block-info'):
+INFO is the src block info, as returned by
+`org-babel-get-src-block-info' (which see).  Some values from its
+PARAMETERS part (header argument alist) can affect the inserted
+result:
 
-:file --- the name of the file to which output should be written.
+:file-desc - when RESULT-PARAMS contains \"file\", use it as
+             description of the inserted link.
 
-:wrap --- the effect is similar to `latex' in RESULT-PARAMS but
-          using the argument supplied to specify the export block
-          or snippet type."
+:wrap        the effect is similar to `latex' in RESULT-PARAMS but
+             using the argument supplied to specify the export block
+             or snippet type."
   (cond ((stringp result)
         (setq result (substring-no-properties result))
         (when (member "file" result-params)
diff --git a/lisp/org-persist.el b/lisp/org-persist.el
index 13e280c4de..b41e9f92d1 100644
--- a/lisp/org-persist.el
+++ b/lisp/org-persist.el
@@ -678,8 +678,8 @@ When INNER is non-nil, do not try to match as list of 
containers."
                ;; `secure-hash' may trigger interactive dialog when it
                ;; cannot determine the coding system automatically.
                ;; Force coding system that works reliably for any text
-               ;; to avoid it.  The has will be consistent anyway, as
-               ;; long as we use the same coding system.
+               ;; to avoid it.  The hash will be consistent, as long
+               ;; as we use the same coding system.
                (let ((coding-system-for-write 'emacs-internal))
                  (secure-hash 'md5 associated)))
          (puthash associated