branch: externals-release/org commit 4617d52fad6362b5742b1f0e11c0732b128261ea Merge: 83fe95d2ee 5ec1ec3337 Author: Kyle Meyer <k...@kyleam.com> Commit: Kyle Meyer <k...@kyleam.com>
Merge branch 'km/from-emacs-30' into bugfix --- lisp/ob-core.el | 2 +- lisp/ob-lilypond.el | 2 +- lisp/org-refile.el | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/ob-core.el b/lisp/ob-core.el index 0878c27a14..d4114c4c54 100644 --- a/lisp/ob-core.el +++ b/lisp/ob-core.el @@ -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) diff --git a/lisp/ob-lilypond.el b/lisp/ob-lilypond.el index a8d85ce7c8..ef747d9bb2 100644 --- a/lisp/ob-lilypond.el +++ b/lisp/ob-lilypond.el @@ -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)) diff --git a/lisp/org-refile.el b/lisp/org-refile.el index c8e64903c3..391e240285 100644 --- a/lisp/org-refile.el +++ b/lisp/org-refile.el @@ -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)