summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Politz <politza@hochschule-trier.de>2017-08-09 16:06:01 +0200
committerAndreas Politz <politza@hochschule-trier.de>2017-08-09 16:06:01 +0200
commit1e056477894497edc48f684cf219e6ae02f8d8ec (patch)
treed27401605c14d9cc3755ccff567351c701b11b9c
parent4873f3ea4891ea885bef1849d3f3e3357da74d3d (diff)
parent804d9929ce354c60d91ab756735ffff8a6f30688 (diff)
Merge branch 'master' of github.com:politza/pdf-tools
-rw-r--r--lisp/pdf-info.el10
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/pdf-info.el b/lisp/pdf-info.el
index 3167f03..ba0dacb 100644
--- a/lisp/pdf-info.el
+++ b/lisp/pdf-info.el
@@ -62,11 +62,11 @@
: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))))
+ (cl-find-if 'file-exists-p
+ `(,(expand-file-name "../server" dir)
+ ,dir))))
"Filename of the epdfinfo executable."
:group 'pdf-info
:type '(file :must-match t))