From 1f08b83cf8e2391fb45d7b91eb6c967a5cd9cb93 Mon Sep 17 00:00:00 2001 From: Daniel Borchmann Date: Sat, 18 Aug 2018 10:49:59 +0200 Subject: [PATCH] [Projects] Fix predicates to check for existing projects --- site-lisp/db-projects.el | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/site-lisp/db-projects.el b/site-lisp/db-projects.el index 5d63c7e..1f3ed07 100644 --- a/site-lisp/db-projects.el +++ b/site-lisp/db-projects.el @@ -23,14 +23,17 @@ (defun projects-project-exists-p (short-name) "Check whether a project named SHORT-NAME already exists" - (file-exists-p (expand-file-name (concat (file-name-as-directory short-name) ".projectile") - projects-main-project-directory))) + (or + (file-exists-p (expand-file-name (concat (file-name-as-directory short-name) + ".git") + projects-main-project-directory)) + (file-exists-p (expand-file-name (concat (file-name-as-directory short-name) + ".projectile") + projects-main-project-directory)))) (defun projects-existing-projects () "Return list of all short-names of existing projects" - (cl-remove-if-not (lambda (name) - (file-exists-p (expand-file-name (concat (file-name-as-directory name) ".projectile") - projects-main-project-directory))) + (cl-remove-if-not #'projects-project-exists-p (directory-files projects-main-project-directory))) (defun projects-add-project (short-name long-name)