Merge from origin/emacs-25

ca50981 Improve time zone documentation
c23c965 Prevent bootstrap autoload backup files
9344612 Disable multicolor fonts on OS X since they are not supported...
c41ce1c Capitalize “Universal Time” in documentation
10597c9 Don't use 'find-program'

1 files changed, 2 insertions, 2 deletions

diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index 9c8a88c80fc..82059c91363 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -162,7 +162,7 @@ end it with `/'.  DIR must be one of `project-roots' or
 DIRS is a list of absolute directories; it should be some
 subset of the project roots and external roots.
 
-The default implementation uses `find-program'.  PROJECT is used
+The default implementation uses `grep-find-program'.  PROJECT is used
 to find the list of ignores for each directory."
   ;; FIXME: Uniquely abbreviate the roots?
   (require 'xref)
@@ -171,7 +171,7 @@ to find the list of ignores for each directory."
           (lambda (dir)
             (let ((command
                    (format "%s %s %s -type f -print0"
-                           find-program
+                           grep-find-program
                            dir
                            (xref--find-ignores-arguments
                             (project-ignores project dir)