master 6cfb38ca954 2/2: Merge remote-tracking branch 'savannah/master' into master-android-1

branch: master
commit 6cfb38ca954c6e54188e4c7682fc8cc925f8aa7e
Merge: 850cbdfa1be 220bd832e1d
Author: Po Lu <[email protected]>
Commit: Po Lu <[email protected]>

    Merge remote-tracking branch 'savannah/master' into master-android-1
---
 lisp/progmodes/flymake.el | 6 +++---
 lisp/progmodes/project.el | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 823aa4fe673..3b017a56d01 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -2238,9 +2238,9 @@ some of this variable's contents the diagnostic listings.")
 (defun flymake-show-project-diagnostics ()
   "Show a list of Flymake diagnostics for the current project."
   (interactive)
-  (let* ((prj (project-current))
-         (root (project-root prj))
-         (buffer (flymake--project-diagnostics-buffer root)))
+  (let* ((prj (project-current t))
+         (default-directory (project-root prj))
+         (buffer (flymake--project-diagnostics-buffer default-directory)))
     (with-current-buffer buffer
       (flymake-project-diagnostics-mode)
       (setq-local flymake--project-diagnostic-list-project prj)
diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index c89d01b0908..4dbcc2607a4 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -406,7 +406,7 @@ to find the list of ignores for each directory."
          ;; expanded and not left for the shell command
          ;; to interpret.
          (localdir (file-name-unquote (file-local-name (expand-file-name dir))))
-         (command (format "%s -H . %s -type f %s -print0"
+         (command (format "%s -L . %s -type f %s -print0"
                           find-program
                           (xref--find-ignores-arguments ignores "./")
                           (if files