summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-04-25 07:30:19 +0200
committerBastien Guerry <bzg@altern.org>2013-04-25 07:30:19 +0200
commit267cbe518398d16cc2460067511dcd1b2bb07ef6 (patch)
treefd67a60cb1d923d7249a8b061805075bece52c75
parent38051ce48179831bc971c83be04f59fe56d94e51 (diff)
parentdcb0ac48a8010ac4dba24ac1fed745f1cf2b3133 (diff)
downloadorg-mode-267cbe518398d16cc2460067511dcd1b2bb07ef6.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/ob-core.el2
-rw-r--r--lisp/org-agenda.el2
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index a89c550..9baff0c 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -681,7 +681,7 @@ arguments and pop open the results in a preview buffer."
(org-babel-expand-body:generic
body params (and (fboundp assignments-cmd)
(funcall assignments-cmd params))))))
- (if (called-interactively-p 'any)
+ (if (org-called-interactively-p 'any)
(org-edit-src-code
nil expanded
(concat "*Org-Babel Preview " (buffer-name) "[ " lang " ]*"))
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 754247a..1fd9ee8 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -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")
(if (or (not (file-writable-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))))))
(user-error "Cannot write agenda to file %s" file))
(org-let (if nosettings nil org-agenda-exporter-settings)