Merge from emacs-23; up to 2010-06-16T23:27:20Z!jay.p.belanger@gmail.com.

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

diff --git a/lisp/org/org-docview.el b/lisp/org/org-docview.el
index ad507546696e6134cfaa105ff2be3687115f5538..ee39d8afc63d51d700605933d173948270021602 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>
+;; Author: Jan Böcker <jan.boecker at jboecker dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.35i
+;; Version: 7.4
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -46,8 +46,11 @@
 
 (require 'org)
 
-(declare-function doc-view-goto-page "doc-view" (page))
-(declare-function doc-view-current-page "doc-view"  (&optional win))
+(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")
 
 (org-add-link-type "docview" 'org-docview-open)
 (add-hook 'org-store-link-functions 'org-docview-store-link)
@@ -62,11 +65,11 @@
       )))
 
 (defun org-docview-store-link ()
-  "Store a link to a docview buffer"
+  "Store a link to a docview buffer."
   (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
@@ -75,11 +78,15 @@
        :description path))))
 
 (defun org-docview-complete-link ()
-  "Use the existing file name completion for file: links to get the file name,
-   then ask the user for the page number and append it."
+  "Use the existing file name completion for file.
+Links to get the file name, then ask the user for the page number
+and append it."
   (concat (replace-regexp-in-string "^file:" "docview:" (org-file-complete-link))
          "::"
          (read-from-minibuffer "Page:" "1")))
 
 
 (provide 'org-docview)
+
+
+;;; org-docview.el ends here