mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-24 07:20:29 +00:00
Code

Merge branch 'km/from-emacs-30' into bugfix

Browse Source
This commit is contained in:
Kyle Meyer 2024-07-01 22:33:46 -04:00
commit 4617d52fad
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/ob-core.el
View File

@ -1778,7 +1778,7 @@ shown below.
#+PROPERTY: var foo=1, bar=2 #+PROPERTY: var foo=1, bar=2
HEADER-ARGUMENTS is alist of all the arguments." HEADER-ARGUMENTS is an alist of all the arguments."
(let (results) (let (results)
(mapc (lambda (pair) (mapc (lambda (pair)
(if (eq (car pair) :var) (if (eq (car pair) :var)

2
lisp/ob-lilypond.el
View File

@ -160,7 +160,7 @@ Otherwise, execute block according to header settings."
(org-babel-lilypond-process-basic body params))) (org-babel-lilypond-process-basic body params)))
(defun org-babel-lilypond-tangle () (defun org-babel-lilypond-tangle ()
"Tangle lilypond blocks, then `org-babel-liypond-execute-tangled-ly'." "Tangle lilypond blocks, then `org-babel-lilypond-execute-tangled-ly'."
(interactive) (interactive)
(if (org-babel-tangle nil "yes" "lilypond") (if (org-babel-tangle nil "yes" "lilypond")
(org-babel-lilypond-execute-tangled-ly) nil)) (org-babel-lilypond-execute-tangled-ly) nil))

2
lisp/org-refile.el
View File

@ -557,7 +557,7 @@ prefix argument (`C-u C-u C-u C-c C-w')."
(let ((origin (point-marker))) (let ((origin (point-marker)))
;; Handle special case when we refile to exactly same ;; Handle special case when we refile to exactly same
;; location with tree promotion/demotion. Point marker ;; location with tree promotion/demotion. Point marker
;; saved by `org-width-wide-buffer' (`save-excursion') ;; saved by `org-with-wide-buffer' (`save-excursion')
;; will then remain before the inserted subtree in ;; will then remain before the inserted subtree in
;; unexpected location. ;; unexpected location.
(set-marker-insertion-type origin t) (set-marker-insertion-type origin t)