diff options
| author | Bastien Guerry <bzg@altern.org> | 2012-09-04 00:06:39 +0200 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2012-09-04 00:06:39 +0200 |
| commit | fa0236ce03d7398654f29f6e64b50606de0d3a5c (patch) | |
| tree | 7510dc2e2c136ad7587f93b306f064de946f19f7 | |
| parent | 320a1201cde3426433a2b9b92b4036cb9706133b (diff) | |
| parent | 256bb297809409cc721086f1177ed1754d7557ea (diff) | |
| download | org-mode-fa0236ce03d7398654f29f6e64b50606de0d3a5c.tar.gz | |
Merge branch 'maint' of orgmode.org:org-mode into maint
| -rw-r--r-- | lisp/org-lparse.el | 4 | ||||
| -rw-r--r-- | lisp/org-odt.el | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/lisp/org-lparse.el b/lisp/org-lparse.el index 52518b3..9d1e034 100644 --- a/lisp/org-lparse.el +++ b/lisp/org-lparse.el @@ -67,7 +67,7 @@ lists." ((file-exists-p file-or-buf) file-or-buf) (t (error "org-lparse-and-open: This shouldn't happen")))) (message "Opening file %s" f) - (org-open-file f) + (org-open-file f 'system) (when org-export-kill-product-buffer-when-displayed (kill-buffer (current-buffer)))))) @@ -509,7 +509,7 @@ This is a helper routine for interactive use." (message "Exported to %s" out-file) (when prefix-arg (message "Opening %s..." out-file) - (org-open-file out-file)) + (org-open-file out-file 'system)) out-file) (t (message "Export to %s failed" out-file) diff --git a/lisp/org-odt.el b/lisp/org-odt.el index c80821f..fbb31d5 100644 --- a/lisp/org-odt.el +++ b/lisp/org-odt.el @@ -243,9 +243,6 @@ standard Emacs.") (mapc (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 (add-to-list 'auto-mode-alist (cons (concat "\\." (car desc) "\\'") 'archive-mode))) |