comparison lisp/org/org-freemind.el @ 107169:566a19f1adb0

* 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.
author Chong Yidong <cyd@stupidchicken.com>
date Tue, 16 Feb 2010 09:46:15 -0500
parents 1d1d5d9bd884
children 594e81986a75 376148b31b5e
comparison
equal deleted inserted replaced
107168:282ddc0ca465 107169:566a19f1adb0
823 "nofile") 823 "nofile")
824 "-line-" (number-to-string line) 824 "-line-" (number-to-string line)
825 ".mm")) 825 ".mm"))
826 (mm-file (read-file-name "Output FreeMind file: " nil nil nil default-mm-file))) 826 (mm-file (read-file-name "Output FreeMind file: " nil nil nil default-mm-file)))
827 (list line mm-file)))) 827 (list line mm-file))))
828 (when (org-freemind-check-overwrite mm-file (called-interactively-p)) 828 (when (org-freemind-check-overwrite mm-file (called-interactively-p 'any))
829 (let ((org-buffer (current-buffer)) 829 (let ((org-buffer (current-buffer))
830 (mm-buffer (find-file-noselect mm-file))) 830 (mm-buffer (find-file-noselect mm-file)))
831 (org-freemind-write-mm-buffer org-buffer mm-buffer node-line) 831 (org-freemind-write-mm-buffer org-buffer mm-buffer node-line)
832 (with-current-buffer mm-buffer 832 (with-current-buffer mm-buffer
833 (basic-save-buffer) 833 (basic-save-buffer)
834 (when (called-interactively-p) 834 (when (called-interactively-p 'any)
835 (switch-to-buffer-other-window mm-buffer) 835 (switch-to-buffer-other-window mm-buffer)
836 (when (y-or-n-p "Show in FreeMind? ") 836 (when (y-or-n-p "Show in FreeMind? ")
837 (org-freemind-show buffer-file-name))))))) 837 (org-freemind-show buffer-file-name)))))))
838 838
839 ;;;###autoload 839 ;;;###autoload
847 (file-name-nondirectory org-file) 847 (file-name-nondirectory org-file)
848 "nofile") 848 "nofile")
849 ".mm")) 849 ".mm"))
850 (mm-file (read-file-name "Output FreeMind file: " nil nil nil default-mm-file))) 850 (mm-file (read-file-name "Output FreeMind file: " nil nil nil default-mm-file)))
851 (list org-file mm-file))) 851 (list org-file mm-file)))
852 (when (org-freemind-check-overwrite mm-file (called-interactively-p)) 852 (when (org-freemind-check-overwrite mm-file (called-interactively-p 'any))
853 (let ((org-buffer (if org-file (find-file-noselect org-file) (current-buffer))) 853 (let ((org-buffer (if org-file (find-file-noselect org-file) (current-buffer)))
854 (mm-buffer (find-file-noselect mm-file))) 854 (mm-buffer (find-file-noselect mm-file)))
855 (org-freemind-write-mm-buffer org-buffer mm-buffer nil) 855 (org-freemind-write-mm-buffer org-buffer mm-buffer nil)
856 (with-current-buffer mm-buffer 856 (with-current-buffer mm-buffer
857 (basic-save-buffer) 857 (basic-save-buffer)
858 (when (called-interactively-p) 858 (when (called-interactively-p 'any)
859 (switch-to-buffer-other-window mm-buffer) 859 (switch-to-buffer-other-window mm-buffer)
860 (when (y-or-n-p "Show in FreeMind? ") 860 (when (y-or-n-p "Show in FreeMind? ")
861 (org-freemind-show buffer-file-name))))))) 861 (org-freemind-show buffer-file-name)))))))
862 862
863 ;;;###autoload 863 ;;;###autoload
870 (file-name-nondirectory org-file) 870 (file-name-nondirectory org-file)
871 "nofile") 871 "nofile")
872 "-sparse.mm")) 872 "-sparse.mm"))
873 (mm-file (read-file-name "Output FreeMind file: " nil nil nil default-mm-file))) 873 (mm-file (read-file-name "Output FreeMind file: " nil nil nil default-mm-file)))
874 (list (current-buffer) mm-file))) 874 (list (current-buffer) mm-file)))
875 (when (org-freemind-check-overwrite mm-file (called-interactively-p)) 875 (when (org-freemind-check-overwrite mm-file (called-interactively-p 'any))
876 (let (org-buffer 876 (let (org-buffer
877 (mm-buffer (find-file-noselect mm-file))) 877 (mm-buffer (find-file-noselect mm-file)))
878 (save-window-excursion 878 (save-window-excursion
879 (org-export-visible ?\ nil) 879 (org-export-visible ?\ nil)
880 (setq org-buffer (current-buffer))) 880 (setq org-buffer (current-buffer)))
881 (org-freemind-write-mm-buffer org-buffer mm-buffer nil) 881 (org-freemind-write-mm-buffer org-buffer mm-buffer nil)
882 (with-current-buffer mm-buffer 882 (with-current-buffer mm-buffer
883 (basic-save-buffer) 883 (basic-save-buffer)
884 (when (called-interactively-p) 884 (when (called-interactively-p 'any)
885 (switch-to-buffer-other-window mm-buffer) 885 (switch-to-buffer-other-window mm-buffer)
886 (when (y-or-n-p "Show in FreeMind? ") 886 (when (y-or-n-p "Show in FreeMind? ")
887 (org-freemind-show buffer-file-name))))))) 887 (org-freemind-show buffer-file-name)))))))
888 888
889 889
1106 (save-match-data 1106 (save-match-data
1107 (let* ((mm-file (buffer-file-name)) 1107 (let* ((mm-file (buffer-file-name))
1108 (default-org-file (concat (file-name-nondirectory mm-file) ".org")) 1108 (default-org-file (concat (file-name-nondirectory mm-file) ".org"))
1109 (org-file (read-file-name "Output org-mode file: " nil nil nil default-org-file))) 1109 (org-file (read-file-name "Output org-mode file: " nil nil nil default-org-file)))
1110 (list mm-file org-file)))) 1110 (list mm-file org-file))))
1111 (when (org-freemind-check-overwrite org-file (called-interactively-p)) 1111 (when (org-freemind-check-overwrite org-file (called-interactively-p 'any))
1112 (let ((mm-buffer (find-file-noselect mm-file)) 1112 (let ((mm-buffer (find-file-noselect mm-file))
1113 (org-buffer (find-file-noselect org-file))) 1113 (org-buffer (find-file-noselect org-file)))
1114 (with-current-buffer mm-buffer 1114 (with-current-buffer mm-buffer
1115 (let* ((xml-list (xml-parse-file mm-file)) 1115 (let* ((xml-list (xml-parse-file mm-file))
1116 (top-node (cadr (cddar xml-list))) 1116 (top-node (cadr (cddar xml-list)))