[elpa] externals-release/org 2ab083dd1a 2/3: Merge branch 'km/from-emacs-master' into bugfix

[ELPA Syncer]

branch: externals-release/org
commit 2ab083dd1a5a27f0e53461f7d1f3fbc052f88bef
Merge: 921e0e8bc1 b77a209f78
Author: Kyle Meyer <kyle@kyleam.com>
Commit: Kyle Meyer <kyle@kyleam.com>

    Merge branch 'km/from-emacs-master' into bugfix
    
    Both Org bugfix's 52dc48050 (Handle compiler warnings from Emacs
    master, 2023-04-27) and Emacs master's 4f0849a9e6d (Remove unused
    values in effect context, 2023-04-09) comment out an unused condition
    in org-babel-insert-result to silence a compiler warning that's new to
    the Emacs master branch.  However, the changes are slightly different,
    so the next sync to emacs-29 will trigger a conflict when merged to
    master.
    
    Takes Emacs's variant to 1) avoid the conflict and 2) undo the
    unrelated space change from Org's variant.  (52dc48050 improved the
    comment slightly, but it's not worth the conflict.)
---
 lisp/ob-core.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index 1c167c0330..e69ce4f1d1 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -2426,13 +2426,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)