mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-21 06:55:35 +00:00
Code

Merge branch 'bugfix'

Browse Source
This commit is contained in:
Ihor Radchenko 2024-07-07 08:26:23 +02:00
commit bcb88fcac8
No known key found for this signature in database
GPG Key ID: 6470762A7DA11D8B
5 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/ORG-NEWS
View File

@ -381,6 +381,10 @@ Image filename chosen can be customized by setting
~org-yank-image-file-name-function~ which by default autogenerates a
filename based on the current time.
Note that ~yank-media~, as of Emacs 30, does not yet support Windows
(Emacs bug#71909) and may not be always reliable on Mac (Emacs
bug#71731).
*** Files and images can be attached by dropping onto Emacs
By default, Org asks the user what to do with the dropped file like

2
lisp/ob-core.el
View File

@ -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)

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)))
(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))

3
lisp/org-agenda.el
View File

@ -2048,6 +2048,9 @@ the normal rules apply."
(defcustom org-agenda-category-icon-alist nil
"Alist of category icon to be displayed in agenda views.
The icons are displayed in place of the %i placeholders in
`org-agenda-prefix-format', which see.
Each entry should have the following format:
(CATEGORY-REGEXP FILE-OR-DATA TYPE DATA-P PROPS)

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)))
;; 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)