mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-08-24 21:02:51 +00:00
Merge branch 'km/from-emacs-master' into bugfix
Both Org bugfix's52dc48050
(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.)
This commit is contained in:
commit
2ab083dd1a
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue