mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-22 07:09:47 +00:00
Code

Merge branch 'maint'

Browse Source 
Conflicts:
	lisp/org.el
This commit is contained in:
Bastien Guerry 2013-02-26 16:14:03 +01:00
commit 76cca82fc1
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/oldexp/org-exp.el
View File

@ -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."

2
lisp/org-docview.el
View File

@ -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)