diff options
| author | David Maus <dmaus@ictsoc.de> | 2010-08-29 21:29:16 +0200 |
|---|---|---|
| committer | David Maus <dmaus@ictsoc.de> | 2010-08-29 21:29:16 +0200 |
| commit | 4b7c9136a71252c5fff1c8e3caf7e272a3b55d81 (patch) | |
| tree | 6e5a4b43d2e8b79eb76925790fc0382608be5a8e | |
| parent | f6c09411a7a295230f8c033e54aadab14adf71e8 (diff) | |
| download | org-mode-4b7c9136a71252c5fff1c8e3caf7e272a3b55d81.tar.gz | |
Remove compile-time dependency on doc-view.el
* org-docview.el (org-docview-store-link): Use expanded macro to get
current page.
(doc-view-goto-page, image-mode-window-get): Declare functions for
byte compiler.
doc-view mode is not available in Emacs22. We need to use the
expanded form of the macro `doc-view-current-page' at compile-time.
| -rw-r--r-- | lisp/org-docview.el | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/org-docview.el b/lisp/org-docview.el index 0e05937..360c1fe 100644 --- a/lisp/org-docview.el +++ b/lisp/org-docview.el @@ -45,7 +45,10 @@ (require 'org) -(eval-when-compile (require 'doc-view)) ; doc-view-current-page macro + +(declare-function doc-view-goto-page "ext:doc-view" (page)) +(declare-function image-mode-window-get "ext:image-mode" + (prop &optional winprops)) (autoload 'doc-view-goto-page "doc-view") @@ -66,7 +69,7 @@ (when (eq major-mode 'doc-view-mode) ;; This buffer is in doc-view-mode (let* ((path buffer-file-name) - (page (doc-view-current-page)) + (page (image-mode-window-get 'page)) (link (concat "docview:" path "::" (number-to-string page))) (description "")) (org-store-link-props |