From ae715ccd3b79c0d97c7aa16dbcadfb2fdd562251 Mon Sep 17 00:00:00 2001 From: thblt Date: Thu, 20 Jul 2017 12:08:34 +0200 Subject: Support Git clone installation Let the default value of 'pdf-info-epdfinfo-program' automatically determine if PDF Tools is installed as a Melpa package (where the epdfinfo binary is in ./build) or as a Git clone (where it's found at ../server/) --- lisp/pdf-info.el | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lisp/pdf-info.el b/lisp/pdf-info.el index 3167f03..fbe6e71 100644 --- a/lisp/pdf-info.el +++ b/lisp/pdf-info.el @@ -62,11 +62,13 @@ :group 'pdf-tools) (defcustom pdf-info-epdfinfo-program - (expand-file-name (if (eq system-type 'windows-nt) - "epdfinfo.exe" - "epdfinfo") - (file-name-directory - (or load-file-name default-directory))) + (expand-file-name (if (eq system-type 'windows-nt) "epdfinfo.exe" "epdfinfo") + (let ((dir (file-name-directory (or load-file-name default-directory)))) + (find-if 'file-exists-p + `(,(expand-file-name "build" dir) + ,(expand-file-name "../server" dir) + dir) + ))) "Filename of the epdfinfo executable." :group 'pdf-info :type '(file :must-match t)) -- cgit v1.2.3 From 2bcf4d28619cfc899050d8f46939912ea4027dc3 Mon Sep 17 00:00:00 2001 From: thblt Date: Thu, 20 Jul 2017 12:47:31 +0200 Subject: Add missing dependency --- lisp/pdf-info.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/pdf-info.el b/lisp/pdf-info.el index fbe6e71..b7d639c 100644 --- a/lisp/pdf-info.el +++ b/lisp/pdf-info.el @@ -49,6 +49,7 @@ ;;; Code: (require 'tq) +(require 'cl) (require 'cl-lib) -- cgit v1.2.3 From cde04f5973334406f24d77ee9ac896f3c01f839b Mon Sep 17 00:00:00 2001 From: thblt Date: Thu, 20 Jul 2017 13:01:46 +0200 Subject: Use function in cl namespace instead of adding extra dep --- lisp/pdf-info.el | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lisp/pdf-info.el b/lisp/pdf-info.el index b7d639c..dc6dff1 100644 --- a/lisp/pdf-info.el +++ b/lisp/pdf-info.el @@ -49,7 +49,6 @@ ;;; Code: (require 'tq) -(require 'cl) (require 'cl-lib) @@ -65,7 +64,7 @@ (defcustom pdf-info-epdfinfo-program (expand-file-name (if (eq system-type 'windows-nt) "epdfinfo.exe" "epdfinfo") (let ((dir (file-name-directory (or load-file-name default-directory)))) - (find-if 'file-exists-p + (cl-find-if 'file-exists-p `(,(expand-file-name "build" dir) ,(expand-file-name "../server" dir) dir) -- cgit v1.2.3 From a7a3440106df6b4f37af46fade54d31977778d88 Mon Sep 17 00:00:00 2001 From: thblt Date: Thu, 20 Jul 2017 17:01:27 +0200 Subject: Remove pointless fallback case --- lisp/pdf-info.el | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lisp/pdf-info.el b/lisp/pdf-info.el index dc6dff1..e9d91b7 100644 --- a/lisp/pdf-info.el +++ b/lisp/pdf-info.el @@ -66,8 +66,7 @@ (let ((dir (file-name-directory (or load-file-name default-directory)))) (cl-find-if 'file-exists-p `(,(expand-file-name "build" dir) - ,(expand-file-name "../server" dir) - dir) + ,(expand-file-name "../server" dir)) ))) "Filename of the epdfinfo executable." :group 'pdf-info -- cgit v1.2.3 From e35c9583cdcc41f2b663cbaeba28c66885e76b1b Mon Sep 17 00:00:00 2001 From: thblt Date: Fri, 21 Jul 2017 15:44:21 +0200 Subject: Fix directory name --- lisp/pdf-info.el | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lisp/pdf-info.el b/lisp/pdf-info.el index e9d91b7..ba0dacb 100644 --- a/lisp/pdf-info.el +++ b/lisp/pdf-info.el @@ -65,9 +65,8 @@ (expand-file-name (if (eq system-type 'windows-nt) "epdfinfo.exe" "epdfinfo") (let ((dir (file-name-directory (or load-file-name default-directory)))) (cl-find-if 'file-exists-p - `(,(expand-file-name "build" dir) - ,(expand-file-name "../server" dir)) - ))) + `(,(expand-file-name "../server" dir) + ,dir)))) "Filename of the epdfinfo executable." :group 'pdf-info :type '(file :must-match t)) -- cgit v1.2.3