Merge from origin/emacs-25

b134c20 Sync with gnulib
bb30fa9 Fix last change on 2016-01-02
488a72f ; Spelling fixes
9b1aab9 Port run-prolog EMACS to SWI-Prolog 7.2.3
0e7bcec Avoid crashes due to unreasonably large or small text scaling
85f257c Improve documentation of 'with-eval-after-load'
668c7bc Improve handling of non-ASCII characters in Git log messages
b570769 Remove undefined behavior in OS X dumper.
97211f3 Fix clipping of xwidgets
e87fbc0 Improve Lisp-level documentation of tooltips
9f1786e Faces names should not end in "-face".
3283271 * src/xsmfns.c (syms_of_xsmfns): Remove stray "s in doc strings.
a1f221b Comint and compile no longer set EMACS
5c28890 * lisp/subr.el (read-key): Don't let the prompt linger (bug#2...
a75b9a6 Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emac...
c93ae7a Allow to customize names of executables used by grep.el
f6497c6 Set locale encoding to UTF-8 when run from OS X GUI.
7ad1d07 Avoid signaling errors in 'M-n' at the 'C-x C-f' prompt
a3f1ac2 Avoid infinite loop in 'studlify-word'
f36df4b Don’t recommend obsolete EMACS env var
fb0b531 * lisp/emacs-lisp/package.el: Change from a few days ago need...

3 files changed, 46 insertions, 26 deletions

diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 0b15a283090..b7ab408f744 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1702,14 +1702,6 @@ Returns the compilation buffer created."
                 (list "TERM=emacs"
                       (format "TERMCAP=emacs:co#%d:tc=unknown:"
                               (window-width))))
-
-              ;; Set the EMACS variable, but
-              ;; don't override users' setting of $EMACS.
-              ;; Remove this hack once Bash 4.4-or-later is common,
-              ;; since it can break 'configure'.
-              (unless (getenv "EMACS")
-                (list "EMACS=t"))
-
               (list (format "INSIDE_EMACS=%s,compile" emacs-version))
               (copy-sequence process-environment))))
         (set (make-local-variable 'compilation-arguments)
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 2b44b58f245..a478c95eb4f 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -427,21 +427,34 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies
 This gets tacked on the end of the generated expressions.")
 
 ;;;###autoload
-(defvar grep-program (purecopy "grep")
+(defcustom grep-program (purecopy "grep")
   "The default grep program for `grep-command' and `grep-find-command'.
-This variable's value takes effect when `grep-compute-defaults' is called.")
+This variable's value takes effect when `grep-compute-defaults' is called."
+  :type 'string
+  :version "25.1"
+  :group 'grep)
 
 ;;;###autoload
-(defvar find-program (purecopy "find")
+(defcustom grep-find-program (purecopy "find")
   "The default find program.
 This is used by commands like `grep-find-command', `find-dired'
-and others.")
+and others."
+  :type 'string
+  :version "25.1"
+  :group 'grep)
+
+(define-obsolete-variable-alias 'find-program 'grep-find-program "25.1")
 
 ;;;###autoload
-(defvar xargs-program (purecopy "xargs")
+(defcustom grep-xargs-program (purecopy "xargs")
   "The default xargs program for `grep-find-command'.
 See `grep-find-use-xargs'.
-This variable's value takes effect when `grep-compute-defaults' is called.")
+This variable's value takes effect when `grep-compute-defaults' is called."
+  :type 'string
+  :version "25.1"
+  :group 'grep)
+
+(define-obsolete-variable-alias 'xargs-program 'grep-xargs-program "25.1")
 
 ;;;###autoload
 (defvar grep-find-use-xargs nil
@@ -611,13 +624,14 @@ This function is called from `compilation-filter-hook'."
         (unless grep-find-use-xargs
           (setq grep-find-use-xargs
                 (cond
-                 ((grep-probe find-program
+                 ((grep-probe grep-find-program
                               `(nil nil nil ,null-device "-exec" "echo"
                                     "{}" "+"))
                   'exec-plus)
                  ((and
-                   (grep-probe find-program `(nil nil nil ,null-device "-print0"))
-                   (grep-probe xargs-program `(nil nil nil "-0" "echo")))
+                   (grep-probe grep-find-program
+                               `(nil nil nil ,null-device "-print0"))
+                   (grep-probe grep-xargs-program `(nil nil nil "-0" "echo")))
                   'gnu)
                  (t
                   'exec))))
@@ -628,10 +642,11 @@ This function is called from `compilation-filter-hook'."
                        ;; after the pipe symbol be quoted if they use
                        ;; forward slashes as directory separators.
                        (format "%s . -type f -print0 | \"%s\" -0 %s"
-                               find-program xargs-program grep-command))
+                               grep-find-program grep-xargs-program
+                               grep-command))
                       ((memq grep-find-use-xargs '(exec exec-plus))
                        (let ((cmd0 (format "%s . -type f -exec %s"
-                                           find-program grep-command))
+                                           grep-find-program grep-command))
                              (null (if grep-use-null-device
                                        (format "%s " null-device)
                                      "")))
@@ -643,7 +658,8 @@ This function is called from `compilation-filter-hook'."
                           (1+ (length cmd0)))))
                       (t
                        (format "%s . -type f -print | \"%s\" %s"
-                               find-program xargs-program grep-command)))))
+                               grep-find-program grep-xargs-program
+                               grep-command)))))
         (unless grep-find-template
           (setq grep-find-template
                 (let ((gcmd (format "%s <C> %s <R>"
@@ -653,17 +669,17 @@ This function is called from `compilation-filter-hook'."
                               "")))
                   (cond ((eq grep-find-use-xargs 'gnu)
                          (format "%s <D> <X> -type f <F> -print0 | \"%s\" -0 %s"
-                                 find-program xargs-program gcmd))
+                                 grep-find-program grep-xargs-program gcmd))
                         ((eq grep-find-use-xargs 'exec)
                          (format "%s <D> <X> -type f <F> -exec %s {} %s%s"
-                                 find-program gcmd null
+                                 grep-find-program gcmd null
                                  (shell-quote-argument ";")))
                         ((eq grep-find-use-xargs 'exec-plus)
                          (format "%s <D> <X> -type f <F> -exec %s %s{} +"
-                                 find-program gcmd null))
+                                 grep-find-program gcmd null))
                         (t
                          (format "%s <D> <X> -type f <F> -print | \"%s\" %s"
-                                 find-program xargs-program gcmd))))))))
+                                 grep-find-program grep-xargs-program gcmd))))))))
 
     ;; Save defaults for this host.
     (setq grep-host-defaults-alist
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el
index 9ee405b31e1..212a5fa69ab 100644
--- a/lisp/progmodes/prolog.el
+++ b/lisp/progmodes/prolog.el
@@ -1374,8 +1374,20 @@ the variable `prolog-prompt-regexp'."
       ()
     (with-current-buffer (get-buffer-create "*prolog*")
       (prolog-inferior-mode)
-      (apply 'make-comint-in-buffer "prolog" (current-buffer)
-             (prolog-program-name) nil (prolog-program-switches))
+
+      ;; The "INFERIOR=yes" hack is for SWI-Prolog 7.2.3 and earlier,
+      ;; which assumes it is running under Emacs if either INFERIOR=yes or
+      ;; if EMACS is set to a nonempty value.  The EMACS setting is
+      ;; obsolescent, so set INFERIOR.  Newer versions of SWI-Prolog should
+      ;; know about INSIDE_EMACS (which replaced EMACS) and should not need
+      ;; this hack.
+      (let ((process-environment
+             (if (getenv "INFERIOR")
+                 process-environment
+               (cons "INFERIOR=yes" process-environment))))
+        (apply 'make-comint-in-buffer "prolog" (current-buffer)
+               (prolog-program-name) nil (prolog-program-switches)))
+
       (unless prolog-system
         ;; Setup auto-detection.
         (setq-local