From 6e6edce5c42bba8a6e42f3ebf304ec853deb3cc8 Mon Sep 17 00:00:00 2001 From: Jason Gross Date: Sat, 7 Jan 2017 20:04:32 -0500 Subject: Better version of path separator usage Thanks, @cpitclaudel ! --- .dir-locals.el.in | 4 ++-- Makefile | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.dir-locals.el.in b/.dir-locals.el.in index 5945f1a68..3e674b5b7 100644 --- a/.dir-locals.el.in +++ b/.dir-locals.el.in @@ -1,5 +1,5 @@ ((coq-mode . ((eval . (let* ((project-root (locate-dominating-file buffer-file-name "_CoqProject")) (coqprime-folder (expand-file-name "@COQPRIME@" project-root)) - (coq-path (split-string (or (getenv "COQPATH") "") "@PATHSEP@" t))) + (coq-path (parse-colon-path (or (getenv "COQPATH") "")))) (unless (memql coqprime-folder coq-path) - (setenv "COQPATH" (mapconcat #'identity (cons coqprime-folder coq-path) "@PATHSEP@")))))))) + (setenv "COQPATH" (mapconcat #'identity (cons coqprime-folder coq-path) path-separator)))))))) diff --git a/Makefile b/Makefile index 20ae25d12..58b0614cb 100644 --- a/Makefile +++ b/Makefile @@ -10,8 +10,6 @@ VERBOSE?= SHOW := $(if $(VERBOSE),@true "",@echo "") HIDE := $(if $(VERBOSE),,@) -PATHSEP?=: - .PHONY: coq clean update-_CoqProject cleanall install \ install-coqprime clean-coqprime coqprime \ specific non-specific \ @@ -132,4 +130,4 @@ printenv:: @echo "COQPATH = $$COQPATH" .dir-locals.el:: - sed 's:@COQPRIME@:$(COQPRIME_FOLDER):g' .dir-locals.el.in | sed s'/@PATHSEP@/$(PATHSEP)/g' > $@ + sed 's:@COQPRIME@:$(COQPRIME_FOLDER):g' .dir-locals.el.in > $@ -- cgit v1.2.3