From 5a48ede3acb1f21a8dd6d56ebbc675b7225d28e5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Simen=20Heggest=C3=B8yl?= <simenheg@gmail.com>
Date: Mon, 25 May 2020 21:10:03 +0200
Subject: [PATCH] Adapt project functions to the new 'project-root'

* lisp/progmodes/project.el (project-dired, project-eshell)
(project--read-project-list, project--write-project-list)
(project--add-to-project-list-front)
(project--remove-from-project-list): Adapt to the new 'project-root'.
---
 lisp/progmodes/project.el | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index 132d172a08e..f00aca83d2d 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -670,15 +670,13 @@ PREDICATE, HIST, and DEFAULT have the same meaning as in
 (defun project-dired ()
   "Open Dired in the current project."
   (interactive)
-  (let ((dirs (project-roots (project-current t))))
-    (dired (car dirs))))
+  (dired (project-root (project-current t))))
 
 ;;;###autoload
 (defun project-eshell ()
   "Open Eshell in the current project."
   (interactive)
-  (let* ((dirs (project-roots (project-current t)))
-         (default-directory (car dirs)))
+  (let ((default-directory (project-root (project-current t))))
     (eshell t)))
 
 (declare-function fileloop-continue "fileloop" ())
@@ -737,7 +735,7 @@ loop using the command \\[fileloop-continue]."
       (let ((dirs (split-string (string-trim (buffer-string)) "\n"))
             (project-list '()))
         (dolist (dir dirs)
-          (cl-pushnew (list (file-name-as-directory dir))
+          (cl-pushnew (file-name-as-directory dir)
                       project-list
                       :test #'equal))
         (setq project--list (reverse project-list))))))
@@ -751,16 +749,16 @@ loop using the command \\[fileloop-continue]."
   "Persist `project--list' to the project list file."
   (let ((filename (locate-user-emacs-file "project-list")))
     (with-temp-buffer
-      (insert (string-join (mapcar #'car project--list) "\n"))
+      (insert (string-join project--list "\n"))
       (write-region nil nil filename nil 'silent))))
 
 (defun project--add-to-project-list-front (pr)
   "Add project PR to the front of the project list and save it.
 Return PR."
   (project--ensure-read-project-list)
-  (let ((dirs (project-roots pr)))
-    (setq project--list (delete dirs project--list))
-    (push dirs project--list))
+  (let ((dir (project-root pr)))
+    (setq project--list (delete dir project--list))
+    (push dir project--list))
   (project--write-project-list)
   pr)
 
@@ -771,8 +769,8 @@ result to disk."
   (project--ensure-read-project-list)
   ;; XXX: This hardcodes that the number of roots = 1.
   ;; It's fine, though.
-  (when (member (list pr-dir) project--list)
-    (setq project--list (delete (list pr-dir) project--list))
+  (when (member pr-dir project--list)
+    (setq project--list (delete pr-dir project--list))
     (message "Project `%s' not found; removed from list" pr-dir)
     (project--write-project-list)))
 
-- 
2.39.5