mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-11-24 07:20:29 +00:00
Merge branch 'km/from-emacs-30' into bugfix
This commit is contained in:
commit
4617d52fad
@ -1778,7 +1778,7 @@ shown below.
|
||||
|
||||
#+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)
|
||||
(mapc (lambda (pair)
|
||||
(if (eq (car pair) :var)
|
||||
|
@ -160,7 +160,7 @@ Otherwise, execute block according to header settings."
|
||||
(org-babel-lilypond-process-basic body params)))
|
||||
|
||||
(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)
|
||||
(if (org-babel-tangle nil "yes" "lilypond")
|
||||
(org-babel-lilypond-execute-tangled-ly) nil))
|
||||
|
@ -557,7 +557,7 @@ prefix argument (`C-u C-u C-u C-c C-w')."
|
||||
(let ((origin (point-marker)))
|
||||
;; Handle special case when we refile to exactly same
|
||||
;; 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
|
||||
;; unexpected location.
|
||||
(set-marker-insertion-type origin t)
|
||||
|
Loading…
Reference in New Issue
Block a user