[Emacs-diffs] /srv/bzr/emacs/trunk r99510: * org-freemind.el (org-freemind-from-org-mode-node)

[Chong Yidong]

------------------------------------------------------------
revno: 99510
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Tue 2010-02-16 09:46:15 -0500
message:
  * 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):
  Pass arg to called-interactively-p.
modified:
  lisp/org/ChangeLog
  lisp/org/org-freemind.el

=== modified file 'lisp/org/ChangeLog'
--- a/lisp/org/ChangeLog        2010-02-14 17:31:34 +0000
+++ b/lisp/org/ChangeLog        2010-02-16 14:46:15 +0000
@@ -1,3 +1,10 @@
+2010-02-15  Chong Yidong  <address@hidden>
+
+       * 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):
+       Pass arg to called-interactively-p.
+
 2010-01-14  Juanma Barranquero  <address@hidden>
 
        * org-protocol.el (org-protocol-flatten-greedy, org-protocol-flatten):

=== modified file 'lisp/org/org-freemind.el'
--- a/lisp/org/org-freemind.el  2010-01-13 08:35:10 +0000
+++ b/lisp/org/org-freemind.el  2010-02-16 14:46:15 +0000
@@ -825,13 +825,13 @@
                                      ".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 (called-interactively-p 'any))
     (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 (called-interactively-p 'any)
           (switch-to-buffer-other-window mm-buffer)
           (when (y-or-n-p "Show in FreeMind? ")
             (org-freemind-show buffer-file-name)))))))
@@ -849,13 +849,13 @@
                             ".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 (called-interactively-p 'any))
     (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 (called-interactively-p 'any)
           (switch-to-buffer-other-window mm-buffer)
           (when (y-or-n-p "Show in FreeMind? ")
             (org-freemind-show buffer-file-name)))))))
@@ -872,7 +872,7 @@
                             "-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 (called-interactively-p 'any))
     (let (org-buffer
           (mm-buffer (find-file-noselect mm-file)))
       (save-window-excursion
@@ -881,7 +881,7 @@
       (org-freemind-write-mm-buffer org-buffer mm-buffer nil)
       (with-current-buffer mm-buffer
         (basic-save-buffer)
-        (when (called-interactively-p)
+        (when (called-interactively-p 'any)
           (switch-to-buffer-other-window mm-buffer)
           (when (y-or-n-p "Show in FreeMind? ")
             (org-freemind-show buffer-file-name)))))))
@@ -1108,7 +1108,7 @@
             (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 (called-interactively-p 'any))
     (let ((mm-buffer (find-file-noselect mm-file))
           (org-buffer (find-file-noselect org-file)))
       (with-current-buffer mm-buffer