mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-05 06:12:59 +00:00
Merge branch 'maint'
This commit is contained in:
commit
267cbe5183
|
@ -681,7 +681,7 @@ arguments and pop open the results in a preview buffer."
|
||||||
(org-babel-expand-body:generic
|
(org-babel-expand-body:generic
|
||||||
body params (and (fboundp assignments-cmd)
|
body params (and (fboundp assignments-cmd)
|
||||||
(funcall assignments-cmd params))))))
|
(funcall assignments-cmd params))))))
|
||||||
(if (called-interactively-p 'any)
|
(if (org-called-interactively-p 'any)
|
||||||
(org-edit-src-code
|
(org-edit-src-code
|
||||||
nil expanded
|
nil expanded
|
||||||
(concat "*Org-Babel Preview " (buffer-name) "[ " lang " ]*"))
|
(concat "*Org-Babel Preview " (buffer-name) "[ " lang " ]*"))
|
||||||
|
|
|
@ -3307,7 +3307,7 @@ If AGENDA-BUFFER-NAME, use this as the buffer name for the agenda to write."
|
||||||
(interactive "FWrite agenda to file: \nP")
|
(interactive "FWrite agenda to file: \nP")
|
||||||
(if (or (not (file-writable-p file))
|
(if (or (not (file-writable-p file))
|
||||||
(and (file-exists-p file)
|
(and (file-exists-p file)
|
||||||
(if (called-interactively-p 'any)
|
(if (org-called-interactively-p 'any)
|
||||||
(not (y-or-n-p (format "Overwrite existing file %s? " file))))))
|
(not (y-or-n-p (format "Overwrite existing file %s? " file))))))
|
||||||
(user-error "Cannot write agenda to file %s" file))
|
(user-error "Cannot write agenda to file %s" file))
|
||||||
(org-let (if nosettings nil org-agenda-exporter-settings)
|
(org-let (if nosettings nil org-agenda-exporter-settings)
|
||||||
|
|
Loading…
Reference in a new issue