mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-07-20 02:56:29 +00:00
Code Releases Activity

Merge branch 'maint'

Browse source
This commit is contained in:
Bastien Guerry 2013-04-25 07:30:19 +02:00
parent 38051ce481 dcb0ac48a8
commit 267cbe5183
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/ob-core.el
View file

@ -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 " ]*"))

2
lisp/org-agenda.el
View file

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