emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/urgrep fe13a3cbb5 081/115: Fix project-root call on Ema


From: ELPA Syncer
Subject: [elpa] externals/urgrep fe13a3cbb5 081/115: Fix project-root call on Emacs 27
Date: Wed, 10 May 2023 03:00:46 -0400 (EDT)

branch: externals/urgrep
commit fe13a3cbb534aae1e2d009f286e3b0e47a051ff8
Author: Jim Porter <jporterbugs@gmail.com>
Commit: Jim Porter <jporterbugs@gmail.com>

    Fix project-root call on Emacs 27
---
 urgrep.el | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/urgrep.el b/urgrep.el
index 6f52d07564..3da8ac5e88 100644
--- a/urgrep.el
+++ b/urgrep.el
@@ -115,6 +115,12 @@ The currently-used tool can be inspected from the hook via
          (format " (default %s)" default))
        ": "))))
 
+;; `project-root' was added in project.el 0.3.0 (Emacs 28.1).
+(defalias 'urgrep--project-root
+  (if (fboundp 'project-root)
+      #'project-root
+    (lambda (project) (car (project-roots project)))))
+
 (defun urgrep--convert-regexp (expr from-syntax to-syntax)
   "Convert the regexp EXPR from FROM-SYNTAX to TO-SYNTAX."
   (cond ((and (not (eq from-syntax to-syntax))
@@ -386,7 +392,7 @@ This caches the default tool per-host in 
`urgrep--host-defaults'."
                  (when-let (((and tool-vc-backend (not vc-backend-name)))
                             (proj (project-current)))
                    (setq vc-backend-name (vc-responsible-backend
-                                          (project-root proj))))
+                                          (urgrep--project-root proj))))
                  ;; If we find the executable (and it's for the right VC
                  ;; backend, if relevant), cache it and then return it.
                  (when (and (executable-find tool-executable t)
@@ -985,7 +991,7 @@ value is 4, return the current directory.  Otherwise, 
prompt for the
 directory."
   (cond
    ((not arg) (let ((proj (project-current)))
-                (if proj (project-root proj) default-directory)))
+                (if proj (urgrep--project-root proj) default-directory)))
    ((= (prefix-numeric-value arg) 4) default-directory)
    (t (read-directory-name "In directory: " nil nil t))))
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]