diff options
| author | Bastien Guerry <bzg@altern.org> | 2013-02-26 16:14:03 +0100 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2013-02-26 16:14:03 +0100 |
| commit | 76cca82fc1c566ef6fbbb27c16baef05dcaed12e (patch) | |
| tree | 00b932a507a27d8721f9b9383c36109266ee5d95 | |
| parent | 04fd44708aa608fda11786b3fc6a0c64be65b283 (diff) | |
| parent | 95375260e5c6b3ff6fa306b6effec9098b1ef37b (diff) | |
| download | org-mode-76cca82fc1c566ef6fbbb27c16baef05dcaed12e.tar.gz | |
Merge branch 'maint'
Conflicts:
lisp/org.el
| -rw-r--r-- | contrib/oldexp/org-exp.el | 9 | ||||
| -rw-r--r-- | lisp/org-docview.el | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/contrib/oldexp/org-exp.el b/contrib/oldexp/org-exp.el index f128b7b..ba66ba7 100644 --- a/contrib/oldexp/org-exp.el +++ b/contrib/oldexp/org-exp.el @@ -49,12 +49,9 @@ (&optional buffer-or-name norecord label)) (declare-function org-unescape-code-in-region "org-src" (beg end)) -(org-autoload 'org-export-generic - "org-export-generic" "Export using the generic exporter" t) -(org-autoload 'org-export-as-odt "org-odt" - "Export the outline to a OpenDocument Text file." t) -(org-autoload 'org-export-as-odt-and-open "org-odt" - "Export the outline to a OpenDocument Text file and open it." t) +(org-autoload "org-odt" '(org-export-generic + org-export-as-odt + org-export-as-odt-and-open)) (defgroup org-export nil "Options for exporting org-listings." diff --git a/lisp/org-docview.el b/lisp/org-docview.el index 97e15e3..72ccc46 100644 --- a/lisp/org-docview.el +++ b/lisp/org-docview.el @@ -49,7 +49,7 @@ (declare-function image-mode-window-get "ext:image-mode" (prop &optional winprops)) -(org-autoload 'doc-view-goto-page "doc-view") +(org-autoload "doc-view" '(doc-view-goto-page)) (org-add-link-type "docview" 'org-docview-open 'org-docview-export) (add-hook 'org-store-link-functions 'org-docview-store-link) |