From 4b7c9136a71252c5fff1c8e3caf7e272a3b55d81 Mon Sep 17 00:00:00 2001 From: David Maus Date: Sun, 29 Aug 2010 21:29:16 +0200 Subject: [PATCH] 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. --- lisp/org-docview.el | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lisp/org-docview.el b/lisp/org-docview.el index 0e05937f0..360c1fe01 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