tweaks to the above (no external script)main

1 files changed, 12 insertions, 12 deletions

diff --git a/lib/doc/jao-pdf.el b/lib/doc/jao-pdf.el
index 9bf0098..15e403a 100644
--- a/lib/doc/jao-pdf.el
+++ b/lib/doc/jao-pdf.el
@@ -108,18 +108,18 @@
 
 ;;; DevonThink
 
-(defun jao-pdf--devon-link (file)
-  (jao-shell-string "osascript"
-                    (expand-file-name "find-devon-url.scpt" jao-data-dir)
-                    (file-truename file)))
-
-(defun jao-pdf-open-in-devon (file &optional page height)
-  (let ((url (jao-pdf--devon-link file)))
-    (unless (string-empty-p (or url ""))
-      (let* ((p (if page (format "?page=%s" (- page 1)) ""))
-             (u (format "%s%s" url p)))
-        (message "Opening %s ..." u)
-        (jao-shell-exec* "open" u)))))
+(jao-when-darwin
+ (require 'jao-devon)
+
+ (defun jao-pdf-open-in-devon (file &optional page height)
+   (let ((url (jao-devon-find-url file)))
+     (if (string-empty-p (or url ""))
+         (let ((jao-browse-doc-use-emacs-p t))
+           (jao-find-or-open file page height))
+       (let* ((p (if page (format "?page=%s" (- page 1)) ""))
+              (u (format "%s%s" url p)))
+         (message "Opening %s ..." u)
+         (jao-shell-exec* t "open" u))))))
 
 ;;; Open doc functions