diff options
| author | thblt <thibault@thb.lt> | 2017-07-20 12:08:34 +0200 |
|---|---|---|
| committer | thblt <thibault@thb.lt> | 2017-07-20 12:14:32 +0200 |
| commit | ae715ccd3b79c0d97c7aa16dbcadfb2fdd562251 (patch) | |
| tree | acc56786bfe2612b58a338839d5c7e5fa7ad137d | |
| parent | f314597b2e391f6564e4f9e5cc3af0b4b53f19e9 (diff) | |
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/)
| -rw-r--r-- | lisp/pdf-info.el | 12 |
1 files 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)) |