From a034dd384c995f09ecf4ec145cfc614a217b4e4e Mon Sep 17 00:00:00 2001
From: Dmitry Gutov <dgutov@yandex.ru>
Date: Fri, 8 Jan 2016 14:32:27 +0300
Subject: [PATCH] Fix two project-find-file issues

* lisp/progmodes/project.el (project--value-in-dir):
Temporarily set enable-local-variables to :all.
(project-find-file, project-or-external-find-file):
All autoloads.
(project--find-file-in): Require xref.
---
 lisp/progmodes/project.el | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index cfe7fc3750a..5070bb0c8ac 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -258,7 +258,8 @@ DIRS must contain directory names."
 (defun project--value-in-dir (var dir)
   (with-temp-buffer
     (setq default-directory dir)
-    (hack-dir-local-variables-non-file-buffer)
+    (let ((enable-local-variables :all))
+      (hack-dir-local-variables-non-file-buffer))
     (symbol-value var)))
 
 (declare-function grep-read-files "grep")
@@ -310,12 +311,14 @@ pattern to search for."
       (user-error "No matches for: %s" regexp))
     (xref--show-xrefs xrefs nil)))
 
+;;;###autoload
 (defun project-find-file ()
   (interactive)
   (let* ((pr (project-current t))
          (dirs (project-roots pr)))
     (project--find-file-in dirs pr)))
 
+;;;###autoload
 (defun project-or-external-find-file ()
   (interactive)
   (let* ((pr (project-current t))
@@ -326,6 +329,7 @@ pattern to search for."
 
 ;; FIXME: Uniquely abbreviate the roots?
 (defun project--find-file-in (dirs project)
+  (require 'xref)
   (let* ((all-files
           (cl-mapcan
            (lambda (dir)
-- 
2.11.4.GIT