1
0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2025-01-06 11:55:57 +00:00

Merge branch 'bugfix'

This commit is contained in:
Ihor Radchenko 2024-12-21 10:39:34 +01:00
commit 8611b411cf
No known key found for this signature in database
GPG Key ID: 6470762A7DA11D8B
2 changed files with 8 additions and 9 deletions

View File

@ -1210,10 +1210,11 @@ to disable them individually.
the item to meaningful levels in the list and eventually get it back
to its initial position.
- {{{kbd(M-RET)}}} (~org-insert-heading~) ::
- {{{kbd(M-RET)}}} (~org-insert-item~) ::
#+kindex: M-RET
#+findex: org-insert-heading
#+findex: org-insert-item
#+findex: org-meta-return
#+vindex: org-M-RET-may-split-line
Insert new item at current level. With a prefix argument, force a
new heading (see [[*Structure Editing]]). If this command is used

View File

@ -227,13 +227,11 @@ Return list of the tangled file names."
(org-babel-tangle nil target-file lang-re)))))
(defun org-babel-tangle-publish (_ filename pub-dir)
"Tangle FILENAME and place the results in PUB-DIR."
(unless (file-exists-p pub-dir)
(make-directory pub-dir t))
(setq pub-dir (file-name-as-directory pub-dir))
;; Rename files to avoid copying to same file when publishing to ./
;; `copy-file' would throw an error when copying file to self.
(mapc (lambda (el) (rename-file el pub-dir t))
"Tangle FILENAME and copy the tangled file to PUB-DIR."
(require 'ox-publish)
(declare-function org-publish-attachment "ox-publish"
(plist filename pub-dir))
(mapc (lambda (el) (org-publish-attachment nil el pub-dir))
(org-babel-tangle-file filename)))
;;;###autoload