jao-pdf: boy, was this a mess

3 files changed, 16 insertions, 19 deletions

diff --git a/lib/doc/jao-org-links.el b/lib/doc/jao-org-links.el
index b38deb0..fc1a241 100644
--- a/lib/doc/jao-org-links.el
+++ b/lib/doc/jao-org-links.el
@@ -112,7 +112,7 @@
            (new (not (file-exists-p file))))
       (if (and (not file-name) (or arg new))
           (org-store-link nil t)
-        (when-let* ((fboundp 'jao-skim-current-doc)
+        (when-let* ((fboundp 'jao-pdf-skim-org-link)
                     (lnk (jao-pdf-skim-org-link nil)))
           (kill-new lnk)))
       (find-file-other-window file)
diff --git a/lib/doc/jao-pdf.el b/lib/doc/jao-pdf.el
index 1b4d9ac..73b4a6a 100644
--- a/lib/doc/jao-pdf.el
+++ b/lib/doc/jao-pdf.el
@@ -98,24 +98,6 @@
 (defun jao-pdf-zathura-org-link (title)
   (jao-pdf--zathura-link (jao-pdf-zathura-file-info title)))
 
-;;; Mac
-
-(when (eq system-type 'darwin)
-  (require 'jao-mac)
-  (defun jao-pdf-skim-org-link (title)
-    (when-let* ((fp (jao-skim-current-doc))
-                (file (file-name-nondirectory (car fp)))
-                (page (cadr fp))
-                (lnk (format "doc:%s::%s" file page)))
-      (org-link-make-string lnk title)))
-
-  (defun jao-pdf-insert-skim-org-link ()
-    (interactive)
-    (if-let* ((title (read-string "Title: "))
-              (lnk (jao-pdf-skim-org-link title)))
-        (insert lnk)
-      (user-error "Skim is not viewing any docs!"))))
-
 ;;; Open doc functions
 (defvar jao-pdf-open-in-emacs t)
 
diff --git a/lib/doc/jao-mac.el b/lib/eos/jao-mac.el
index 916a84d..ae13c0f 100644
--- a/lib/doc/jao-mac.el
+++ b/lib/eos/jao-mac.el
@@ -153,6 +153,21 @@
       (insert txt)
       (pop-to-buffer (current-buffer)))))
 
+(defun jao-pdf-skim-org-link (title)
+  (when-let* ((fp (jao-skim-current-doc))
+              (file (file-name-nondirectory (car fp)))
+              (page (cadr fp))
+              (lnk (format "doc:%s::%s" file page)))
+    (org-link-make-string lnk title)))
+
+;;;###autoload
+(defun jao-pdf-insert-skim-org-link ()
+  (interactive)
+  (if-let* ((title (read-string "Title: "))
+            (lnk (jao-pdf-skim-org-link title)))
+      (insert lnk)
+    (user-error "Skim is not viewing any docs!")))
+
 ;;; NetNewsWire
 
 (defvar jao-nnw--current-article-script