From: Dmitry Gutov <dmitry@gutov.dev>
Date: Fri, 15 Mar 2024 02:28:45 +0000 (+0200)
Subject: (project--value-in-dir): Ensure that the global value is still honored
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f920a1a511c750591a0826943818f4dee4f4dec8;p=emacs.git

(project--value-in-dir): Ensure that the global value is still honored

* lisp/progmodes/project.el (project--value-in-dir):
Ensure that the global value of the variable is still honored,
when the variable is not in dir-locals.

(cherry picked from commit 77a86d738eebc7a80b7d4a6357a5fa675df9de8c)
---

diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index 47db14bde27..69f419bdab3 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -805,7 +805,8 @@ DIRS must contain directory names."
     (let ((enable-local-variables :all))
       (hack-dir-local-variables))
     ;; Don't use `hack-local-variables-apply' to avoid setting modes.
-    (alist-get var file-local-variables-alist)))
+    (alist-get var file-local-variables-alist
+               (symbol-value var))))
 
 (cl-defmethod project-buffers ((project (head vc)))
   (let* ((root (expand-file-name (file-name-as-directory (project-root project))))