]> git.eshelyaron.com Git - emacs.git/commitdiff
(project--value-in-dir): Ensure that the global value is still honored
authorDmitry Gutov <dmitry@gutov.dev>
Fri, 15 Mar 2024 02:28:45 +0000 (04:28 +0200)
committerEshel Yaron <me@eshelyaron.com>
Fri, 15 Mar 2024 09:06:03 +0000 (10:06 +0100)
* 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)

lisp/progmodes/project.el

index 47db14bde276957e9ecf8b2b6433581ba4c72e23..69f419bdab3602892182755c74fdbd3e314c0da4 100644 (file)
@@ -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))))