summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Dominik <carsten.dominik@gmail.com>2010-04-18 16:10:55 +0200
committerCarsten Dominik <carsten.dominik@gmail.com>2010-04-18 16:49:36 +0200
commit0c8557b4019d0101784553bc193a4813e1976955 (patch)
treeca2b7af78dd2b471fa407d21839536f1b7fe278a
parent88149c2390ba4f6bac000d0ab7b4089f660a66fa (diff)
downloadorg-mode-0c8557b4019d0101784553bc193a4813e1976955.tar.gz
Silence compiler about called-interactively
-rwxr-xr-xlisp/ChangeLog8
-rw-r--r--lisp/org-freemind.el14
2 files changed, 15 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b58fab4..638c133 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2010-04-18 Carsten Dominik <carsten.dominik@gmail.com>
+
+ * org-freemind.el (org-freemind-from-org-mode-node)
+ (org-freemind-from-org-mode, )
+ (org-freemind-from-org-sparse-tree, org-freemind-to-org-mode): Use
+ interactive-p instead of called-interactively, because this is
+ backward compatible with older Emacsen I still support..
+
2010-04-16 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-define-heading-targets): Fix bug in
diff --git a/lisp/org-freemind.el b/lisp/org-freemind.el
index 0042288..b61ee60 100644
--- a/lisp/org-freemind.el
+++ b/lisp/org-freemind.el
@@ -808,13 +808,13 @@ Otherwise give an error say the file exists."
".mm"))
(mm-file (read-file-name "Output FreeMind file: " nil nil nil default-mm-file)))
(list line mm-file))))
- (when (org-freemind-check-overwrite mm-file (called-interactively-p))
+ (when (org-freemind-check-overwrite mm-file (interactive-p))
(let ((org-buffer (current-buffer))
(mm-buffer (find-file-noselect mm-file)))
(org-freemind-write-mm-buffer org-buffer mm-buffer node-line)
(with-current-buffer mm-buffer
(basic-save-buffer)
- (when (called-interactively-p)
+ (when (interactive-p)
(switch-to-buffer-other-window mm-buffer)
(when (y-or-n-p "Show in FreeMind? ")
(org-freemind-show buffer-file-name)))))))
@@ -832,13 +832,13 @@ Otherwise give an error say the file exists."
".mm"))
(mm-file (read-file-name "Output FreeMind file: " nil nil nil default-mm-file)))
(list org-file mm-file)))
- (when (org-freemind-check-overwrite mm-file (called-interactively-p))
+ (when (org-freemind-check-overwrite mm-file (interactive-p))
(let ((org-buffer (if org-file (find-file-noselect org-file) (current-buffer)))
(mm-buffer (find-file-noselect mm-file)))
(org-freemind-write-mm-buffer org-buffer mm-buffer nil)
(with-current-buffer mm-buffer
(basic-save-buffer)
- (when (called-interactively-p)
+ (when (interactive-p)
(switch-to-buffer-other-window mm-buffer)
(when (y-or-n-p "Show in FreeMind? ")
(org-freemind-show buffer-file-name)))))))
@@ -855,7 +855,7 @@ Otherwise give an error say the file exists."
"-sparse.mm"))
(mm-file (read-file-name "Output FreeMind file: " nil nil nil default-mm-file)))
(list (current-buffer) mm-file)))
- (when (org-freemind-check-overwrite mm-file (called-interactively-p))
+ (when (org-freemind-check-overwrite mm-file (interactive-p))
(let (org-buffer
(mm-buffer (find-file-noselect mm-file)))
(save-window-excursion
@@ -864,7 +864,7 @@ Otherwise give an error say the file exists."
(org-freemind-write-mm-buffer org-buffer mm-buffer nil)
(with-current-buffer mm-buffer
(basic-save-buffer)
- (when (called-interactively-p)
+ (when (interactive-p)
(switch-to-buffer-other-window mm-buffer)
(when (y-or-n-p "Show in FreeMind? ")
(org-freemind-show buffer-file-name)))))))
@@ -1091,7 +1091,7 @@ PATH should be a list of steps, where each step has the form
(default-org-file (concat (file-name-nondirectory mm-file) ".org"))
(org-file (read-file-name "Output org-mode file: " nil nil nil default-org-file)))
(list mm-file org-file))))
- (when (org-freemind-check-overwrite org-file (called-interactively-p))
+ (when (org-freemind-check-overwrite org-file (interactive-p))
(let ((mm-buffer (find-file-noselect mm-file))
(org-buffer (find-file-noselect org-file)))
(with-current-buffer mm-buffer