From: Philip Kaludercic <philipk@posteo.net>
Date: Fri, 7 Oct 2022 20:36:12 +0000 (+0200)
Subject: * lisp/emacs-lisp/package.el (package-report-bug): Use 'file-in-directory-p'
X-Git-Tag: emacs-29.0.90~1616^2~307^2~70
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7c66223dfba64c29afddf2f13cbf322d4cc4d12a;p=emacs.git

* lisp/emacs-lisp/package.el (package-report-bug): Use 'file-in-directory-p'
---

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 6e891fede1f..ad01dbc197e 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -4555,16 +4555,15 @@ DESC must be a `package-desc' object."
   (let ((maint (package-maintainers desc))
         (name (symbol-name (package-desc-name desc)))
         vars)
-    (let ((check (apply-partially #'file-equal-p (package-desc-dir desc))))
-      (dolist-with-progress-reporter (group custom-current-group-alist)
-          "Scanning for modified user options..."
-        (dolist (ent (get (cdr group) 'custom-group))
-          (when (and (custom-variable-p (car ent))
-                     (boundp (car ent))
-                     (not (eq (custom--standard-value (car ent))
-                              (default-toplevel-value (car ent))))
-                     (locate-dominating-file (car group) check))
-            (push (car ent) vars)))))
+    (dolist-with-progress-reporter (group custom-current-group-alist)
+        "Scanning for modified user options..."
+      (dolist (ent (get (cdr group) 'custom-group))
+        (when (and (custom-variable-p (car ent))
+                   (boundp (car ent))
+                   (not (eq (custom--standard-value (car ent))
+                            (default-toplevel-value (car ent))))
+                   (file-in-directory-p (car group) (package-desc-dir desc)))
+          (push (car ent) vars))))
     (dlet ((reporter-prompt-for-summary-p t))
       (reporter-submit-bug-report maint name vars))))