Merge changes from emacs-23 branch

[gnu-emacs] / lisp / org / org-docview.el

diff --git a/lisp/org/org-docview.el b/lisp/org/org-docview.el
index 0ef5df0fda6ce859664c907ff14c855362963fc3..201567251d7c7c36fde5715656c72eee442b453b 100644 (file)
--- a/lisp/org/org-docview.el
+++ b/lisp/org/org-docview.el
@@ -1,11 +1,11 @@
 ;;; org-docview.el --- support for links to doc-view-mode buffers
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 ;; Author: Jan Böcker <jan.boecker at jboecker dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.01
+;; Version: 7.7
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -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
@@ -85,6 +88,6 @@ and append it."
 
 (provide 'org-docview)
 
-;; arch-tag: dd147a78-cce1-481b-b40a-15869417debe
+
 
 ;;; org-docview.el ends here