ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint' of orgmode.org:org-mode into maint

This commit is contained in:
Bastien Guerry 2012-09-04 00:06:39 +02:00
parent 320a1201cd 256bb29780
commit fa0236ce03
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/org-lparse.el
View File

@ -67,7 +67,7 @@ lists."
((file-exists-p file-or-buf) file-or-buf) ((file-exists-p file-or-buf) file-or-buf)
(t (error "org-lparse-and-open: This shouldn't happen")))) (t (error "org-lparse-and-open: This shouldn't happen"))))
(message "Opening file %s" f) (message "Opening file %s" f)
(org-open-file f) (org-open-file f 'system)
(when org-export-kill-product-buffer-when-displayed (when org-export-kill-product-buffer-when-displayed
(kill-buffer (current-buffer)))))) (kill-buffer (current-buffer))))))
@ -509,7 +509,7 @@ This is a helper routine for interactive use."
(message "Exported to %s" out-file) (message "Exported to %s" out-file)
(when prefix-arg (when prefix-arg
(message "Opening %s..." out-file) (message "Opening %s..." out-file)
(org-open-file out-file)) (org-open-file out-file 'system))
out-file) out-file)
(t (t
(message "Export to %s failed" out-file) (message "Export to %s failed" out-file)

3
lisp/org-odt.el
View File

@ -243,9 +243,6 @@ standard Emacs.")
(mapc (mapc
(lambda (desc) (lambda (desc)
;; Let Org open all OpenDocument files using system-registered app
(add-to-list 'org-file-apps
(cons (concat "\\." (car desc) "\\'") 'system))
;; Let Emacs open all OpenDocument files in archive mode ;; Let Emacs open all OpenDocument files in archive mode
(add-to-list 'auto-mode-alist (add-to-list 'auto-mode-alist
(cons (concat "\\." (car desc) "\\'") 'archive-mode))) (cons (concat "\\." (car desc) "\\'") 'archive-mode)))